host cd: move users to separate file

2 files changed, 55 insertions, 48 deletions

diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index bdd6ccec..93797098 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -10,6 +10,7 @@ in
       <secrets/hashedPasswords.nix>
       ./iptables.nix
       ./networking.nix
+      ./users.nix
       ../common/nixpkgs.nix
       ../tv/base.nix
       ../tv/base-cac-CentOS-7-64bit.nix
@@ -76,52 +77,4 @@ in
   };
 
   sound.enable = false;
-
-  # TODO replace by ./modules/cd-users.nix
-  users.extraGroups = {
-
-    # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories
-    #    Loaded: loaded (/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/example/systemd/system/systemd-tmpfiles-setup.service)
-    #    Active: failed (Result: exit-code) since Mon 2015-03-16 10:29:18 UTC; 4s ago
-    #      Docs: man:tmpfiles.d(5)
-    #            man:systemd-tmpfiles(8)
-    #   Process: 19272 ExecStart=/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/bin/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev (code=exited, status=1/FAILURE)
-    #  Main PID: 19272 (code=exited, status=1/FAILURE)
-    # 
-    # Mar 16 10:29:17 cd systemd-tmpfiles[19272]: [/usr/lib/tmpfiles.d/legacy.conf:26] Unknown group 'lock'.
-    # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal configured, ignoring.
-    # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal/7b35116927d74ea58785e00b47ac0f0d configured, ignoring.
-    # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service: main process exited, code=exited, status=1/FAILURE
-    # Mar 16 10:29:18 cd systemd[1]: Failed to start Create Volatile Files and Directories.
-    # Mar 16 10:29:18 cd systemd[1]: Unit systemd-tmpfiles-setup.service entered failed state.
-    # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service failed.
-    # warning: error(s) occured while switching to the new configuration
-    lock.gid = 10001;
-
-  };
-  users.extraUsers =
-    {
-      root = {
-        openssh.authorizedKeys.keys = [
-          (readFile <pubkeys/deploy_wu.ssh.pub>)
-          (readFile <pubkeys/tv_wu.ssh.pub>)
-        ];
-      };
-
-      mv = rec {
-        name = "mv";
-        uid = 1338;
-        group = "users";
-        home = "/home/${name}";
-        createHome = true;
-        useDefaultShell = true;
-        openssh.authorizedKeys.keys = [
-          (readFile <pubkeys/mv_vod.ssh.pub>)
-        ];
-      };
-
-    };
-
-  users.mutableUsers = false;
-
 }
diff --git a/modules/cd/users.nix b/modules/cd/users.nix
new file mode 100644
index 00000000..e470c63b
--- /dev/null
+++ b/modules/cd/users.nix
@@ -0,0 +1,54 @@
+{ ... }:
+
+let
+  inherit (builtins) readFile;
+in
+
+{
+  # TODO replace by ./modules/cd-users.nix
+  users.extraGroups = {
+
+    # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories
+    #    Loaded: loaded (/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/example/systemd/system/systemd-tmpfiles-setup.service)
+    #    Active: failed (Result: exit-code) since Mon 2015-03-16 10:29:18 UTC; 4s ago
+    #      Docs: man:tmpfiles.d(5)
+    #            man:systemd-tmpfiles(8)
+    #   Process: 19272 ExecStart=/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/bin/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev (code=exited, status=1/FAILURE)
+    #  Main PID: 19272 (code=exited, status=1/FAILURE)
+    # 
+    # Mar 16 10:29:17 cd systemd-tmpfiles[19272]: [/usr/lib/tmpfiles.d/legacy.conf:26] Unknown group 'lock'.
+    # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal configured, ignoring.
+    # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal/7b35116927d74ea58785e00b47ac0f0d configured, ignoring.
+    # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service: main process exited, code=exited, status=1/FAILURE
+    # Mar 16 10:29:18 cd systemd[1]: Failed to start Create Volatile Files and Directories.
+    # Mar 16 10:29:18 cd systemd[1]: Unit systemd-tmpfiles-setup.service entered failed state.
+    # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service failed.
+    # warning: error(s) occured while switching to the new configuration
+    lock.gid = 10001;
+
+  };
+  users.extraUsers =
+    {
+      root = {
+        openssh.authorizedKeys.keys = [
+          (readFile <pubkeys/deploy_wu.ssh.pub>)
+          (readFile <pubkeys/tv_wu.ssh.pub>)
+        ];
+      };
+
+      mv = rec {
+        name = "mv";
+        uid = 1338;
+        group = "users";
+        home = "/home/${name}";
+        createHome = true;
+        useDefaultShell = true;
+        openssh.authorizedKeys.keys = [
+          (readFile <pubkeys/mv_vod.ssh.pub>)
+        ];
+      };
+
+    };
+
+  users.mutableUsers = false;
+}