diff options
| author | tv <tv@shackspace.de> | 2015-08-14 15:51:29 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-08-14 15:51:29 +0200 |
| commit | b8b2575d8313cfd0696a121cee1b8738faff6638 (patch) | |
| tree | b4e2d4f838da343a50cf6cfbe39eefc32813e6c0 | |
| parent | c950117e0ce7b4d038f613475066a2cdb0e592e3 (diff) | |
| parent | f36177cf91fa7db20f7e30e84910fb9efd82b975 (diff) | |
Merge remote-tracking branch 'mors/master'
| -rw-r--r-- | krebs/3modules/default.nix | 2 | ||||
| -rw-r--r-- | lass/3modules/folderPerms.nix | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index ba501d227..a0d4f0157 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -310,9 +310,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"; }; }; }; 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 |