diff options
Diffstat (limited to 'custom')
-rw-r--r-- | custom/tinc/def.nix | 6 | ||||
-rw-r--r-- | custom/uucp.nix | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/custom/tinc/def.nix b/custom/tinc/def.nix index 97653f72..89020633 100644 --- a/custom/tinc/def.nix +++ b/custom/tinc/def.nix | |||
@@ -195,10 +195,12 @@ in | |||
195 | users.extraUsers = flip mapAttrs' cfg.networks (network: _: | 195 | users.extraUsers = flip mapAttrs' cfg.networks (network: _: |
196 | nameValuePair ("tinc.${network}") ({ | 196 | nameValuePair ("tinc.${network}") ({ |
197 | description = "Tinc daemon user for ${network}"; | 197 | description = "Tinc daemon user for ${network}"; |
198 | group = "tinc.${network}"; | ||
198 | isSystemUser = true; | 199 | isSystemUser = true; |
199 | }) | 200 | }) |
200 | ); | 201 | ); |
201 | 202 | users.extraGroups = flip mapAttrs' cfg.networks (network: _: | |
203 | nameValuePair ("tinc.${network}") ({}) | ||
204 | ); | ||
202 | }; | 205 | }; |
203 | |||
204 | } | 206 | } |
diff --git a/custom/uucp.nix b/custom/uucp.nix index 54f5aac4..e812c4cf 100644 --- a/custom/uucp.nix +++ b/custom/uucp.nix | |||
@@ -244,6 +244,7 @@ in { | |||
244 | 244 | ||
245 | users.users."uucp" = { | 245 | users.users."uucp" = { |
246 | name = "uucp"; | 246 | name = "uucp"; |
247 | group = "uucp"; | ||
247 | isSystemUser = true; | 248 | isSystemUser = true; |
248 | isNormalUser = false; | 249 | isNormalUser = false; |
249 | createHome = true; | 250 | createHome = true; |
@@ -252,6 +253,7 @@ in { | |||
252 | useDefaultShell = true; | 253 | useDefaultShell = true; |
253 | openssh.authorizedKeys.keys = map restrictKey (concatLists (mapAttrsToList (name: node: node.publicKeys) cfg.remoteNodes)); | 254 | openssh.authorizedKeys.keys = map restrictKey (concatLists (mapAttrsToList (name: node: node.publicKeys) cfg.remoteNodes)); |
254 | } // cfg.sshUser; | 255 | } // cfg.sshUser; |
256 | users.groups."uucp" = {}; | ||
255 | 257 | ||
256 | system.activationScripts."uucp-sshconfig" = '' | 258 | system.activationScripts."uucp-sshconfig" = '' |
257 | mkdir -p ${config.users.users."uucp".home}/.ssh | 259 | mkdir -p ${config.users.users."uucp".home}/.ssh |