From dc6a9a2be33614e7526790abf2b5286b4558979e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 27 Apr 2016 12:27:32 +0200
Subject: more sensible uucp user config

---
 custom/uucp.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'custom')

diff --git a/custom/uucp.nix b/custom/uucp.nix
index 8a9a1df6..07724ff7 100644
--- a/custom/uucp.nix
+++ b/custom/uucp.nix
@@ -29,12 +29,6 @@ in {
       sshUser = mkOption { 
         type = types.attrs;
         default = {
-          name = "uucp";
-          isSystemUser = true;
-          isNormalUser = false;
-          createHome = true;
-          home = "/var/spool/uucp";
-          description = "User for uucp over ssh";
         };
         description = "The local uucp linux-user";
       };
@@ -109,7 +103,14 @@ in {
       '';
     };
 
-    users.users."uucp" = config.services.uucp.sshUser;
+    users.users."uucp" = {
+      name = "uucp";
+      isSystemUser = true;
+      isNormalUser = false;
+      createHome = true;
+      home = config.services.uucp.spoolDir;
+      description = "User for uucp over ssh";
+    } // config.services.uucp.sshUser;
 
     system.activationScripts."uucp-sshconfig" = ''
       mkdir -p ${config.users.users."uucp".home}/.ssh
-- 
cgit v1.2.3