From f5fa77fb7363ada9386ea8900de49e7ab6faed9b Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Aug 2015 15:20:53 +0200 Subject: [PATCH 1/2] krebs 3: add lass's mails --- krebs/3modules/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 9ad9c9f91..ec433dce8 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -309,9 +309,11 @@ let users = addNames { lass = { pubkey = readFile ../../Zpubkeys/lass.ssh.pub; + mail = "lass@mors.retiolum"; }; uriel = { pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; + mail = "uriel@mors.retiolum"; }; }; }; From f36177cf91fa7db20f7e30e84910fb9efd82b975 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 14 Aug 2015 15:41:49 +0200 Subject: [PATCH 2/2] lass 3 folderPerms: remove recursive option --- lass/3modules/folderPerms.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/lass/3modules/folderPerms.nix b/lass/3modules/folderPerms.nix index 789fd48dc..bb0320327 100644 --- a/lass/3modules/folderPerms.nix +++ b/lass/3modules/folderPerms.nix @@ -1,5 +1,8 @@ { config, lib, pkgs, ... }: +#TODO: implement recursive mode maybe? +# enable different mods for files and folders + let inherit (pkgs) writeScript @@ -45,10 +48,6 @@ let ''; default = null; }; - recursive = mkOption { - type = bool; - default = false; - }; }; })); }; @@ -85,23 +84,21 @@ let ]; buildPermission = perm: + #TODO: create folder maybe + #TODO: check if permission is valid if (perm.permission == null) then "" else - if perm.recursive then - "chmod -R ${perm.permission} ${perm.path}" - else - "chmod ${perm.permission} ${perm.path}" + "chmod ${perm.permission} ${perm.path}" ; buildOwner = perm: + #TODO: create folder maybe + #TODO: check if owner/group valid if (perm.owner == null) then "" else - if perm.recursive then - "chown -R ${perm.owner} ${perm.path}" - else - "chown ${perm.owner} ${perm.path}" + "chown ${perm.owner} ${perm.path}" ; in out