Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'mors/master'

Browse Source
This commit is contained in:
tv 2015-08-14 15:51:29 +02:00
commit b8b2575d83
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/default.nix
View File

@ -310,9 +310,11 @@ let
users = addNames { users = addNames {
lass = { lass = {
pubkey = readFile ../../Zpubkeys/lass.ssh.pub; pubkey = readFile ../../Zpubkeys/lass.ssh.pub;
mail = "lass@mors.retiolum";
}; };
uriel = { uriel = {
pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
mail = "uriel@mors.retiolum";
}; };
}; };
}; };

17
lass/3modules/folderPerms.nix
View File

@ -1,5 +1,8 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
#TODO: implement recursive mode maybe?
# enable different mods for files and folders
let let
inherit (pkgs) inherit (pkgs)
writeScript writeScript
@ -45,10 +48,6 @@ let
''; '';
default = null; default = null;
}; };
recursive = mkOption {
type = bool;
default = false;
};
}; };
})); }));
}; };
@ -85,21 +84,19 @@ let
]; ];
buildPermission = perm: buildPermission = perm:
#TODO: create folder maybe
#TODO: check if permission is valid
if (perm.permission == null) then if (perm.permission == null) then
"" ""
else
if perm.recursive then
"chmod -R ${perm.permission} ${perm.path}"
else else
"chmod ${perm.permission} ${perm.path}" "chmod ${perm.permission} ${perm.path}"
; ;
buildOwner = perm: buildOwner = perm:
#TODO: create folder maybe
#TODO: check if owner/group valid
if (perm.owner == null) then if (perm.owner == null) then
"" ""
else
if perm.recursive then
"chown -R ${perm.owner} ${perm.path}"
else else
"chown ${perm.owner} ${perm.path}" "chown ${perm.owner} ${perm.path}"
; ;