Commit graph

7205 commits

Author SHA1 Message Date
Franz Pletz
35cbbeb146
nixos/network-interfaces: cannot delay device units
Systemd is complaining that it can't delay the startup of device units.
We have a before dependency on the respective device unit for every
netdev service, which doesn't make any sense because we create the
actual interface in this service.

(cherry picked from commit 13a110e696)
2017-09-25 14:07:24 +02:00
Franz Pletz
2d178d8793
nixos/network-interfaces: IPs must always be set
Previously, depending on the environment and the type of interface that
was created, the configured IPs of an interface wouldn't be applied on a
nixos-rebuild switch. It works after a reboot.

This patch ensures that the network-addresses service is started
either via the network-link service or if the networking target is
activated (i.e. on system activation).

Fixes #28474 #16230.

(cherry picked from commit 3a670daa98)
2017-09-25 14:07:24 +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
1c641c46d6
systemd-tmpfiles: fix docs
We have been doing this since 4e4161c212

(cherry picked from commit 43404d9acf)
2017-09-24 13:22:15 +02: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
Jaka Hudoklin
99af0a66e5
kubernetes module: per service kubeconfig support
(cherry picked from commit c96ca5f3bd)
2017-09-24 13:05:01 +02:00
Jaka Hudoklin
11bbff3883
kubernetes module: flannel support, minor fixes
- add flannel support
- remove deprecated authorizationRBACSuperAdmin option
- rename from deprecated poratalNet to serviceClusterIpRange
- add nodeIp option for kubelet
- kubelet, add br_netfilter to kernelModules
- enable firewall by default
- enable dns by default on node and on master
- disable iptables for docker by default on nodes
- dns, restart on failure
- update tests

and other minor changes

(cherry picked from commit 7dfeac88ac)
2017-09-24 13:05:01 +02:00
Matej Cotman
29617dfc97
kubernetes: fix minor issues
(cherry picked from commit 8e14e978c8)
2017-09-24 13:05:01 +02:00
Matej Cotman
05dc4e6bf6
kubernetes: update service
(cherry picked from commit ed322f4235)
2017-09-24 13:05:01 +02:00
Jaka Hudoklin
51f0056f85
kubernetes module: authorization improvements
(cherry picked from commit 90d5468ad6)
2017-09-24 13:05:01 +02:00
Graham Christensen
beb1f1ea91
nixos/rabbitmq: fix restarts and sasl logs
1. The chmod 400 with the preset cookie prevented restarts, as
on the second boot it would fail to write to the cookie. Oops.

2. As far as I can tell, sasl logs were disabled because of the
following error:

{error,{cannot_log_to_tty,sasl_report_tty_h,not_installed}}

Not because we actually wanted to disable them. This meant the
management plugin wasn't usable due to a bug set to be fixed in
3.7.0.

(cherry picked from commit f3b9ac73e2)
2017-09-23 17:59:07 -04:00
Franz Pletz
7bd9dac1bd
nixos-generate-config: add programs options examples
(cherry picked from commit 0f5cd17f2c)
2017-09-23 20:05:01 +02:00
Franz Pletz
8c5fdf1baf
nixos/install: disable kernel debug console logging
Add another option for debugging instead. Lots of users have been
complaining about this default behaviour.

This patch also cleans up the EFI bootloader entries in the ISO.

(cherry picked from commit 3d040f9305)
2017-09-23 20:05:01 +02:00
Silvan Mosberger
aca6a2bd3f encrypted devices: add label set assertion (#29651) 2017-09-23 19:02:58 +01:00
Robin Gloster
5825331856
fanctl, fan module: remove
This has been broken nearly all the time due to the patches needed to
iproute2 not being compatible with the newer versions we have been
shipping. As long as Ubuntu does not manage to upstream these changes
so they are maintained with iproute2 and we don't have a maintainer
updating these patches to new iproute2 versions it is not feasible to
have this available.

(cherry picked from commit 08b09fdc5c)
2017-09-23 18:00:40 +02:00
Bjørn Forsman
1cdb055879 nixos/gitolite: use group 'gitolite' instead of 'nogroup'
Having files (git repositories) owned by 'nogroup' is a bad idea.

(cherry picked from commit 3a58e41e43)
2017-09-23 17:13:06 +02:00
Peter Simons
23a021d12e Revert "nixos: add option for bind to not resolve local queries (#29503)"
This reverts commit 670b4e29ad. The change
added in this commit was controversial when it was originally suggested
in https://github.com/NixOS/nixpkgs/pull/29205. Then that PR was closed
and a new one opened, https://github.com/NixOS/nixpkgs/pull/29503,
effectively circumventing the review process. I don't agree with this
modification. Adding an option 'resolveLocalQueries' to tell the locally
running name server that it should resolve local DNS queries feels
outright nuts. I agree that the current state is unsatisfactory and that
it should be improved, but this is not the right way.
2017-09-23 16:36:05 +02:00
aszlig
f7411b81ed
nixos/dovecot: Fix createMailUser implementation
This option got introduced in 7904499542
and it didn't check whether mailUser and mailGroup are null, which they
are by default.

Now we're only creating the user if createMailUser is set in conjunction
with mailUser and the group if mailGroup is set as well.

I've added a NixOS VM test so that we can verify whether dovecot works
without any additional options set, so it serves as a regression test
for issue #29466 and other issues that might come up with future changes
to the Dovecot service.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #29466
Cc: @qknight, @abbradar, @ixmatus, @siddharthist, @peti
(cherry picked from commit 3ba2095a42)
2017-09-23 15:00:33 +02:00
Joachim Fasting
8dd308c031
nixos/lock-kernel-modules: fix deferred fileSystem mounts
Ensure that modules required by all declared fileSystems are explicitly
loaded.  A little ugly but fixes the deferred mount test.

See also https://github.com/NixOS/nixpkgs/issues/29019

(cherry picked from commit 1df6cf5d1d)
2017-09-23 13:30:18 +02:00
Joachim Fasting
ce59db3423
nixos/hardened: simplify script
(cherry picked from commit 15a4f9d8ef)
2017-09-23 13:29:35 +02:00
Pavel Goran
5b1d686a22 nixos/gitolite: customize .gitolite.rc declaratively
Add the `extraGitoliteRc` option to customize the `.gitolite.rc`
configuration file declaratively.

Resolves #29249.

(cherry picked from commit c73a3813fa)
2017-09-22 18:30:22 +02:00
André-Patrick Bubel
f9efede475
nixos/fileystems: Fix boot fails with encrypted fs
Boot fails when a keyfile is configured for all encrypted filesystems
and no other luks devices are configured. This is because luks support is only
enabled in the initrd, when boot.initrd.luks.devices has entries. When a
fileystem has a keyfile configured though, it is setup by a custom
command, not by boot.initrd.luks.

This commit adds an internal config flag to enable luks support in the
initrd file, even if there are no luks devices configured.

(cherry picked from commit 2000fba561)
2017-09-22 16:01:53 +02:00
Ruben Maher
4070c95d3c
nfs-utils: set /etc/krb5.keytab as default path for rpc-gssd
Currently the `rpc-gssd.service` has a `ConditionPathExists` clause that can
never be met, because it's looking for stateful data inside `/nix/store`.

`auth-rpcgss-module.service` also only starts if this file exists.

Fixes NixOS/nixpkgs#29509.

(cherry picked from commit 98a2316166)
2017-09-22 15:59:06 +02:00
Michael Weiss
586db45da0
fuse3: init at 3.1.1
This includes fuse-common (fusePackages.fuse_3.common) as recommended by
upstream. But while fuse(2) and fuse3 would normally depend on
fuse-common we can't do that in nixpkgs while fuse-common is just
another output from the fuse3 multiple-output derivation (i.e. this
would result in a circular dependency). To avoid building fuse3 twice I
decided it would be best to copy the shared files (i.e. the ones
provided by fuse(2) and fuse3) from fuse-common to fuse (version 2) and
avoid collision warnings by defining priorities. Now it should be
possible to install an arbitrary combination of "fuse", "fuse3", and
"fuse-common" without getting any collision warnings. The end result
should be the same and all changes should be backwards compatible
(assuming that mount.fuse from fuse3 is backwards compatible as stated
by upstream [0] - if not this might break some /etc/fstab definitions
but that should be very unlikely).

My tests with sshfs (version 2 and 3) didn't show any problems.

See #28409 for some additional information.

[0]: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0

(cherry picked from commit 351f5fc585)
2017-09-22 15:54:59 +02:00
Pascal Bach
85ae319351
gluster service: use str instead of path for private key
This pervents the user from accidently commiting the key to the nix store.
If providing a path instead of a string.

(cherry picked from commit 8ed758696c)
2017-09-22 15:53:49 +02:00
Pascal Bach
5f996d59d9
glusterfs service: add support for TLS communication
TLS settings are implemented as submodule.

(cherry picked from commit c68118ce65)
2017-09-22 15:53:35 +02:00
Raphael Das Gupta
47bc25a916
xonsh: fix typo ("xnosh") in "enable" description
(cherry picked from commit 42d6e933d6)
2017-09-22 15:22:29 +02:00
Pascal Bach
0269045390 node-exporter service: fix documentation for enabledCollectors
(cherry picked from commit a217d73381)
2017-09-21 21:04:57 +01:00
Robin Gloster
0ca5090fd8
gitlab: 9.5.2 -> 9.5.5
(cherry picked from commit e2822f6384)
2017-09-21 20:26:59 +02:00
Peter Hoeg
34efc5b056 kmscon: reset ExecStart to allow override
The getty@.service unit already has an ExecStart so we cannot simply set a new
one in order to override it or we will get this error:

systemd[1]: getty@tty1.service: Service has more than one ExecStart= setting, which is only allowed for Type=oneshot services. Refusing.

Instead "reset" ExecStart by setting it to empty which is the systemd way of
doing it.

(cherry picked from commit 6558f81bc9)
2017-09-21 10:03:18 +08:00
Robin Gloster
0fccf291f2
gitlab module: fix shell hook path
(cherry picked from commit 370ac6275e)
2017-09-20 23:53:08 +02:00
Peter Hoeg
1d7ba9f7d6 mtr nixos module: wrap the proper binary
(cherry picked from commit 4b78d44ab6)
2017-09-20 20:15:44 +08:00
Rob Vermaas
eb873f6c78
Make sure dummy kernel module is loaded for hologram-agent. 2017-09-20 10:57:54 +00:00
Aneesh Agrawal
3e9f43b6f3
radicale: Add extraArgs option to assist in data migration
(cherry picked from commit fcd590d116)
2017-09-19 22:30:34 +02:00
Franz Pletz
a3f35a270a
ssh service: add sftpFlags option
(cherry picked from commit dc08dcf6e7)
2017-09-19 22:30:32 +02:00
Robert Klotzner
00b7744d46
coturn service: Fix coturn to properly come up (#29415)
properly also in case dhcpcd being used.

Without network-online.target, coturn will fail to listen on addresses that
come up with dhcpcd.

(cherry picked from commit a9f60224f8)
2017-09-19 22:30:31 +02:00