diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-04 19:36:39 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-04 19:36:39 +0200 |
| commit | 23741692fabcdfee9a8b7f89576236a69d4d4d8a (patch) | |
| tree | b3d53e3f97547c93bba340176bee375cb720ebdc /nixos/modules/services | |
| parent | d051989efa7354384271bb21c5f471cfc05c1541 (diff) | |
| parent | b9484875bcc1918945d373e0ea46ffff938adb05 (diff) | |
| download | nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.gz nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.bz2 nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.lz nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.xz nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.zst nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.zip | |
Merge master into staging
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/networking/dhcpd.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/torrent/transmission.nix | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index ea964fd68e43..f2d34560a718 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -439,17 +439,18 @@ in services.xserver.displayManager.hiddenUsers = map ({ name, ... }: name) nixbldUsers; + # FIXME: use systemd-tmpfiles to create Nix directories. system.activationScripts.nix = stringAfter [ "etc" "users" ] '' # Nix initialisation. - mkdir -m 0755 -p \ + install -m 0755 -d \ /nix/var/nix/gcroots \ /nix/var/nix/temproots \ /nix/var/nix/userpool \ /nix/var/nix/profiles \ /nix/var/nix/db \ /nix/var/log/nix/drvs - mkdir -m 1777 -p \ + install -m 1777 -d \ /nix/var/nix/gcroots/per-user \ /nix/var/nix/profiles/per-user \ /nix/var/nix/gcroots/tmp diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 2eac6dfec5b7..fd7e317eee95 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -36,6 +36,7 @@ let preStart = '' mkdir -m 755 -p ${cfg.stateDir} + chown dhcpd:nogroup ${cfg.stateDir} touch ${cfg.stateDir}/dhcpd.leases ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 4911a64c95d0..1cf85af2a06c 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -59,8 +59,8 @@ in time the service starts). String values must be quoted, integer and boolean values must not. - See https://trac.transmissionbt.com/wiki/EditConfigFiles for - documentation. + See https://github.com/transmission/transmission/wiki/Editing-Configuration-Files + for documentation. ''; }; |