Commit graph

8315 commits

Author SHA1 Message Date
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
cf4e7c0181
nixos/hardened test: add failing test-case for deferred mounts
(cherry picked from commit bccaf63067)
2017-09-23 13:29:47 +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
aszlig
5f5eb7f0d8
nixos/tests/virtualbox: Fix netcat invocation
This is a backwards-incompatibility in netcat-openbsd introduced due to
bumping the netcat version to 1.130 in
a72ba661ac.

Version 1.130 no longer exits on EOF but now needs to be passed the -N
flag in order to exit on EOF.

The upstream change reads[1] like this:

  Don't shutdown nc(1)'s network socket when stdin closes. Matches
  *Hobbit*'s original netcat and GNU netcat; revert to old behaviour
  with the new -N flag if needed. After much discussion with otto
  deraadt tedu and Martin Pelikan.  ok deraadt@

Here is the diff of this change:

http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/netcat.c.diff?r1=1.110&r2=1.111&f=h

[1]: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/netcat.c?rev=1.111&content-type=text/x-cvsweb-markup

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit a75265924f)
2017-09-21 03:50:20 +02: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
2c1879863e
radicale: Test migration functionality
This also provides an example of how to migrate.

(cherry picked from commit 28c2cea847)
2017-09-19 22:30:34 +02: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
Franz Pletz
e4e7f61d8d
nixos/networking: network is online if default gw set
Previously services depending on network-online.target would wait until
dhcpcd times out if it was enabled and a static network address
configuration was used. Setting the default gateway statically is enough
for the networking to be considered online.

This also adjusts the relevant networking tests to wait for
network-online.target instead of just network.target.

(cherry picked from commit b179908414)
2017-09-19 22:30:31 +02:00
Maximilian Güntner
50b5587fe5
tests: ipfs: enable autoMount tests
(cherry picked from commit 44475cae27)
2017-09-19 22:30:30 +02:00
Eric Litak
0f2484c34f
ipfs: autoMount working without root
(cherry picked from commit 1a15c5d8c6)
2017-09-19 22:30:30 +02:00
Eric Litak
a8d411e3cb
ipfs: workaround for upstream bug; doc fixes
(cherry picked from commit 6324317c76)
2017-09-19 22:30:30 +02:00
Florian Jacob
ddbec38741
nixos/mysql: declarative users & databases
using Unix socket authentication, ensured on every rebuild.

(cherry picked from commit 839e3c7666)
2017-09-19 22:30:30 +02:00
Kranium Gikos
66eccc7c23
influxdb service: fixup postStart script to handle TLS
(cherry picked from commit 662b409b72)
2017-09-19 22:30:29 +02:00
Justin Humm
e2197ade16
gollum service: init
(cherry picked from commit b5a5d0ba84)
2017-09-19 22:30:29 +02:00
Pascal Bach
f6d4769b34
squid service: intial service based on default config
(cherry picked from commit 2ed89eddf3)
2017-09-19 22:30:28 +02:00
Rodney Lorrimar
f3c517d5e0
nixos/gogs: Fix module when no passwords provided
If neither database.password or database.passwordFile were provided,
it would try and fail to coerce null to a string.

This fixes the situation where there is no password for the database.

Resolves #27950

(cherry picked from commit 6460e459de)
2017-09-19 22:30:27 +02:00
Franz Pletz
5fa2fe91c0
Merge branch 'staging-17.09' into release-17.09 2017-09-19 01:36:17 +02:00
gwitmond
670b4e29ad nixos: add option for bind to not resolve local queries (#29503)
When the user specifies the networking.nameservers setting in the
configuration file, it must take precedence over automatically
derived settings.

The culprit was services.bind that made the resolver set to
127.0.0.1 and ignore the nameserver setting.

This patch adds a flag to services.bind to override the nameserver
to localhost. It defaults to true. Setting this to false prevents the
service.bind and dnsmasq.resolveLocalQueries settings from
overriding the users' settings.

Also, when the user specifies a domain to search, it must be set in
the resolver configuration, even if the user does not specify any
nameservers.
2017-09-18 13:21:44 +02:00
Joachim Fasting
15abcf6237
nixos/tests: move sysctl test to misc
(cherry picked from commit c85cf60c83)
2017-09-17 18:26:32 +02:00
Ryan Mulligan
b81ef1e31d
matterbridge, modules/matterbridge: init at 1.1.0
(cherry picked from commit 9c786d82f2)
2017-09-17 18:25:27 +02:00
Matt McHenry
73f34f1c7a
systemd: better document enabled, wantedBy, and requiredBy (#29453)
the systemd.unit(5) discussion of wantedBy and requiredBy is in the
[Install] section, and thus focused on stateful 'systemctl enable'.
so, clarify that in NixOS, wantedBy & requiredBy are still what most
users want, and not to be confused with enabled.

(cherry picked from commit cfbac1beb4)
2017-09-17 18:24:07 +02:00
Tuomas Tynkkynen
545d8e7cb4
sd-image-aarch64: Increase CMA memory so RPi3 virtual console works again
(cherry picked from commit c8e7aab0c8)
2017-09-17 18:19:46 +02:00
joachim schiele
4ddf1959d0
dovecot2: added quota, changed pop3 default
(cherry picked from commit 7904499542)
2017-09-17 18:19:45 +02:00
Jörg Thalheim
f6d4327d55
zfsUnstable: init at 2017-09-12
(cherry picked from commit 1ecf3e862f)
2017-09-17 18:19:45 +02:00
Linus Heckemann
787bf9292f
nixos-install: use FIFO for system closure
This avoids running out of space in space-constrained environments,
e.g. VMs with relatively small amounts of memory and tmp on tmpfs

(cherry picked from commit 77ce02201e)
2017-09-17 18:19:44 +02:00
Linus Heckemann
d0edf75d99
nixos-install: only search for nixpkgs when needed
(cherry picked from commit 8b1f1d93fa)
2017-09-17 18:19:44 +02:00
Eelco Dolstra
887d60d5aa
nix: 1.11.14 -> 1.11.15
(cherry picked from commit 6dad1f70ce)
2017-09-17 18:19:44 +02:00
Robin Gloster
55f626fbb6
nixos/redmine: fix create role
postgresql create role no longer supports NOCREATEUSER option. See
https://www.postgresql.org/docs/9.6/static/release-9-6.html for
details.

(cherry picked from commit f5e0e94b2a)
2017-09-17 18:19:37 +02:00
Ryan Mulligan
cc7c4bb36f
nixos/mattermost: fix create role
postgresql create role no longer supports NOCREATEUSER option. See
https://www.postgresql.org/docs/9.6/static/release-9-6.html for
details.

(cherry picked from commit 8585898909)
2017-09-17 18:19:36 +02:00
geistesk
935dbdc30a
nixos/fireqos: add service
(cherry picked from commit 2316f16ac0)
2017-09-17 18:19:35 +02:00
Edward Tjörnhammar
fe0ea07417
nixos, i2pd: nat option, default true
(cherry picked from commit 847ce53ab1)
2017-09-17 18:19:28 +02:00
timor
5218059660
physlock: 0.5 -> 11-dev
Update physlock to a more current version which supports PAM and
systemd-logind.  Amongst others, this should work now with the slim
login manager without any additional configuration, because it does
not rely on the utmp mechanism anymore.

(cherry picked from commit ae87a30a83)
2017-09-17 18:19:27 +02:00