Commit graph

4,222 commits

Author SHA1 Message Date
Alexander Foremny
19879836d1
nixos/gitlab: fix gitlab service
Fix GitLab service and update documentation. Fixes #30059.

(cherry picked from commit 03a5d729ef)
2017-10-04 02:43:34 +02:00
Pascal Bach
2b20f8cad6
glusterfs service: fix issues with useRpcbind
(cherry picked from commit 2239dc6234)
2017-10-03 18:22:27 +02:00
Niklas Hambüchen
28db622326
glusterfs service: Change default killMode to "control-group".
This is a better default for NixOS because it ensures that config
changes happen fully when NixOS users expect it.

(cherry picked from commit 18eecae4b6)
2017-10-03 18:22:27 +02:00
Niklas Hambüchen
b7b08a5d84
glusterfs service: Ensure log directory exists for glustereventsd.
Prevents glustereventsd failing at startup in case it starts
before glusterd has started (whose `preStart` would also
create the needed directory).

(cherry picked from commit 08f7e4516c)
2017-10-03 18:22:27 +02:00
Niklas Hambüchen
f1d1a0aa8a
glusterfs service: Add killMode and stopKillTimeout options
(cherry picked from commit e233a518bd)
2017-10-03 18:22:27 +02:00
Niklas Hambüchen
9f8f750c8c
glusterfs service: Add settings to disable rpcbind and the events daemon.
See also https://github.com/NixOS/nixpkgs/pull/22225#pullrequestreview-26459886

(cherry picked from commit bd54b72676)
2017-10-03 18:22:27 +02:00
Niklas Hambüchen
605b40c068
glusterfs service: Don't make it a prerequisite of network-online.target.
This introduces dependency cycles.

A network file system to be running is not required for a network
connection to be available.

19759cfeab (commitcomment-22044519)
(cherry picked from commit 5e2815dfb7)
2017-10-03 18:22:27 +02:00
Joerg Thalheim
c12a3e2d47
nullmailer: simplify config generation
(cherry picked from commit 91eb6cf82c)
2017-09-28 22:43:50 +02:00
Marius Bergmann
4a8c74019e
nullmailer: add remotesFile option
The current `remotes` option is a string option containing nullmailer remote
definitions. However, those definitions may contain secret credentials and
should therefore not be put world-readable in the nix store.

I added a `remotesFile` option, which allows to specify a path to the remotes
definition file instead. This way, the definitions can be kept outside of the
nix store with more secure file permissions.

(cherry picked from commit e741cc4881)
2017-09-28 22:43:50 +02:00
Marius Bergmann
e9356fd0df
nullmailer: use proper description for remotes option
(cherry picked from commit 02e89de71c)
2017-09-28 22:43:50 +02:00
Marius Bergmann
89b75ba92f
nullmailer: fix relative -> absolute path in preStart script
(cherry picked from commit f9d64a068b)
2017-09-28 22:43:49 +02:00
Robin Gloster
3c31adf461
gitlab: 9.5.5 -> 10.0.2
(cherry picked from commit 19681fbffb8ba92284eada496ce68e500434c0ef)
2017-09-28 20:33:49 +02:00
Robin Gloster
9766dde7b1
Revert "kubernetes: fix hashes after dockerTools change"
This reverts commit 9ba024f6d8.

(cherry picked from commit 4aeb38e5b9)
2017-09-28 14:12:11 +02:00
Ryan Mulligan
0554733f57
nixos/monit: install monit as system package, use default config file path
(cherry picked from commit c6f513b56a)
2017-09-28 13:12:21 +02:00
volth
c868d427cb nixos/tinc: add "restartTriggers" back
Add "restartTriggers" back to restart the Tinc daemon when its peer is removed.
Reverted #27660
2017-09-28 00:58:15 +01:00
Niklas Hambüchen
e9bbe85605
consul service: Restart on failure.
Consul is a service you typically want to have running all the time;
it's not supposed to quit by itself.

(cherry picked from commit f4c53f1940)

Closes #29861.
2017-09-28 00:44:55 +02:00
Rostislav Beneš
33494a75d7
nixos/xserver,gdm: let GDM handle X server verbosity.
(cherry picked from commit 0cad98dde1)
2017-09-28 00:44:54 +02:00
Rostislav Beneš
4500e11fda
nixos/gdm,nvidia: new options to enable GDM on Wayland and disabling it for nvidia drivers.
(cherry picked from commit 4ef82339c9)
2017-09-28 00:44:53 +02:00
Franz Pletz
2ae16ef5d7
wpa_supplicant service: restart instead of stop & start
We now wait for dhcpcd to acquire a lease but dhcpcd is restarted on
system activation. As wpa_supplicant is stopped while dhcpcd is
restarting a significant delay is introduced on systems with wireless
network connections only. This changes the wpa_supplicant service to
also be restarted together with dhcpcd in case both services were
changed.

(cherry picked from commit 725dee203a)
2017-09-28 00:44:52 +02:00
Marius Bergmann
b9935c7c5d znc: fix openFirewall option
The current version is broken:
- there's no `openFirewall` attribute directly in the `cfg` set
- the `port` option is an attribute of the `confOptions` set

I used the proper attribute for the firewall port and moved the `openFirewall`
option directly up to the `services.znc` set, as it's rather a general option
for the whole service than a znc-specific option (which are located inside the
`confOptions` set).
2017-09-27 23:09:56 +01:00
Rodney Lorrimar
86528f928a
mysqlBackup service: let it work with default settings
* Grants enough privileges to the configured user so that it can run
  mysqldump.

* Adds a nixos test.

* Use systemd timers instead of a cronjob (by @fadenb).

* Creates a new user for backups by default, instead of using mysql
  user.

* Ensures that backup user has write permissions on backup location.

* Write backup to a temporary file before renaming so that a failed
  backup won't overwrite the previous backup, and so that the backup
  location will never contain a partial backup.

Breaking changes:

 * Renamed period to calendar to reflect the change in how to
   configure the backup time.

 * A failed backup will no longer result in cron sending an e-mail --
   users' monitoring systems must be updated.

Resolves #24728

(cherry picked from commit 56eba66f77)
2017-09-27 18:46:21 +02:00
Joerg Thalheim
e8278f584f
nixos/tinc: remove useless script argument
ExecStart is sufficient and more transparent to the user.

(cherry picked from commit 75ba415fbc)
2017-09-27 18:21:27 +02:00
Joerg Thalheim
3615636fa0
nixos/tinc: do not add Device= by default
tinc can figure this out based on DeviceType.
I also got `/dev/net/tun FD in bad state` after a particular upgrade.

(cherry picked from commit ad8cb0917f)
2017-09-27 18:21:22 +02:00
Eelco Dolstra
861987c70e
nix-daemon: Bump the default number of build users
While it's annoying to pollute the user database with a lot of nixbld*
users, 10 users is really too low for many modern systems.

(cherry picked from commit 79d547b4bb)
2017-09-27 18:20:55 +02:00
Peter Simons
11d0942d66 nixos(spamassassin): fix trailing whitespace
(cherry picked from commit 99e24590cb)
2017-09-27 14:51:42 +02:00
Peter Simons
a30571c1cf nixos(spamassassin): provide /etc/spamassassin to fix sa-learn et al
Spamassassin expects its system-wide configuration at /etc/spamassassin, and
some user tools (like sa-learn) need to read those configuration files.
Therefore, we provide a symlink from /etc/spamassassin to the appropriate Nix
store path to make sure those tools work without the user having to pass an
elaborate --siteconfig path that, potentially, changes every time the system
updates.

Fixes https://github.com/NixOS/nixpkgs/issues/29414.

(cherry picked from commit bfab392e6e)
2017-09-27 14:51:42 +02:00
Samuel Dionne-Riel
b968e8af94
mediawiki: 1.27.3 -> 1.29.1
(cherry picked from commit 0b1c73f4da)
2017-09-26 22:49:33 +02:00
Jan Tojnar
edf780b54f gnome3.at-spi2-core: fix service not found error
The service was not registered as a systemd service resulting in errors
in the system journal every time a GNOME application was launched.

See: #16327
2017-09-26 00:40:57 +01:00
Joerg Thalheim
cd54c92211
nixos/tinydns: default data to empty string
(not strictly required to start the service)

(cherry picked from commit 735b41c34f)
2017-09-26 00:09:24 +02:00
Matt McHenry
80e8a10c47
nixos/dnscache: add module
with improvements suggested by Jörg Thalheim <joerg@thalheim.io>

(cherry picked from commit 1b7e5eaa79)
2017-09-26 00:09:08 +02:00
Matt McHenry
e92e498ad5
nixos/tinydns: add module
with improvements suggested by Jörg Thalheim <joerg@thalheim.io>

(cherry picked from commit ab851b63da)
2017-09-26 00:08:51 +02:00
Francois-Rene Rideau
bc149176ac
nfsd: add extraNfsdConfig
(cherry picked from commit 62983f5cae)
2017-09-26 00:03:09 +02:00
Pavel Goran
a35620e5f2 nixos/gitolite: add enableGitAnnex option
(cherry picked from commit cee657f9a3)
2017-09-25 22:12:59 +02:00
Silvan Mosberger
6a1978f7b4
nixos/radicale: fix default version (#29743)
(cherry picked from commit a8c97ad23e)
2017-09-25 14:12:43 +02:00
Kranium Gikos
ad0f639d43 influxdb sevice: make postStart test work with non-localhost configurations (#29734)
make postStart test work with non-localhost configurations

(cherry picked from commit 412fa16bff)
2017-09-24 15:38:16 +01:00
Jan Tojnar
bc28875f8c gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.

(cherry picked from commit 69698ec11c)
2017-09-24 12:45:23 +01:00
Robin Gloster
24a8c6d5a4
kubernetes: fix bad merge 2017-09-24 13:05:04 +02:00
Robin Gloster
cc668d5dea
kubernetes: fix hashes after dockerTools change
(cherry picked from commit 9ba024f6d8)
2017-09-24 13:05:04 +02:00
Matej Cotman
0c7ff1e626
kubernetes: fix dns addon hashes, fix clusterDns, enable proxy on master
(cherry picked from commit 6ea272ced4)
2017-09-24 13:05:03 +02:00
Jaka Hudoklin
d4c9d7ed0e
kubernetes module: refactor module system, kube-dns as module
(cherry picked from commit ddf5de5de0)
2017-09-24 13:05:03 +02:00
Jaka Hudoklin
30b99fed97
kubernetes module: seedDockerImages option for seeding docker images built with nix
(cherry picked from commit 2beadcf181)
2017-09-24 13:05:03 +02:00
Jaka Hudoklin
bbefc9eb13
kubernetes module: webhook authorization for kubelet
(cherry picked from commit 9d97c92d68)
2017-09-24 13:05:03 +02:00
Jaka Hudoklin
b913ef9358
kubernetes module: fix documentation links
(cherry picked from commit 7c893623d4)
2017-09-24 13:05:03 +02:00
Jaka Hudoklin
e901b8c15e
kubernetes module: add featureGates option
(cherry picked from commit 74f99525e0)
2017-09-24 13:05:03 +02:00
Jaka Hudoklin
f8971667d1
kubernetes module: kubelet, add socat to path for kubectl portforward
(cherry picked from commit 55dbbfd899)
2017-09-24 13:05:02 +02:00
Jaka Hudoklin
613cc03b62
kubernetes module: enable leader elect by default
(cherry picked from commit 8e48fff268)
2017-09-24 13:05:02 +02:00
Jaka Hudoklin
0603b6c6f1
kubernetes module: add storage and tolerations addmission controllers
(cherry picked from commit 856ca7347f)
2017-09-24 13:05:02 +02:00
Jaka Hudoklin
77f08ce157
kubernetes module: fix cidr ranges
(cherry picked from commit d842d539d9)
2017-09-24 13:05:02 +02:00
Jaka Hudoklin
cec76e3b8a
kubernetes module: default auth mode to only RBAC
(cherry picked from commit b25d155976)
2017-09-24 13:05:02 +02:00
Jaka Hudoklin
c75998c202
kubernetes module: add support for common CA file
(cherry picked from commit c2622910ab)
2017-09-24 13:05:01 +02:00