diff options
| author | Mark Laws <mdl@60hz.org> | 2016-01-18 11:54:23 -0800 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2016-01-20 02:09:40 +0100 |
| commit | 1c393cbb3c60b85070950c8abc30a5308015ce3d (patch) | |
| tree | bc8bf2afbd5785540c9963b3e5844c1a822434f9 /nixos | |
| parent | 8da914cad47afe146ee0e575259b522933ebc47b (diff) | |
| download | nixlib-1c393cbb3c60b85070950c8abc30a5308015ce3d.tar nixlib-1c393cbb3c60b85070950c8abc30a5308015ce3d.tar.gz nixlib-1c393cbb3c60b85070950c8abc30a5308015ce3d.tar.bz2 nixlib-1c393cbb3c60b85070950c8abc30a5308015ce3d.tar.lz nixlib-1c393cbb3c60b85070950c8abc30a5308015ce3d.tar.xz nixlib-1c393cbb3c60b85070950c8abc30a5308015ce3d.tar.zst nixlib-1c393cbb3c60b85070950c8abc30a5308015ce3d.zip | |
gale service: fix permissions configuration, fixes #12457
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/gale.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix index 3a5d9bd63c7b..bc975159cdfd 100644 --- a/nixos/modules/services/networking/gale.nix +++ b/nixos/modules/services/networking/gale.nix @@ -76,7 +76,7 @@ in system.activationScripts.gale = mkIf cfg.enable ( stringAfter [ "users" "groups" ] '' - chmod -R 755 ${home} + chmod 755 ${home} mkdir -m 0777 -p ${home}/auth/cache mkdir -m 1777 -p ${home}/auth/local # GALE_DOMAIN.gpub mkdir -m 0700 -p ${home}/auth/private # ROOT.gpub @@ -86,7 +86,8 @@ in mkdir -m 0700 -p ${home}/.gale/auth/private # GALE_DOMAIN.gpri ln -sf ${pkgs.gale}/etc/gale/auth/trusted/ROOT "${home}/auth/trusted/ROOT" - chown -R ${cfg.user}:${cfg.group} ${home} + chown ${cfg.user}:${cfg.group} ${home} ${home}/auth ${home}/auth/* + chown ${cfg.user}:${cfg.group} ${home}/.gale ${home}/.gale/auth ${home}/.gale/auth/private '' ); @@ -149,10 +150,9 @@ in after = [ "network.target" ]; preStart = '' - install -m 0640 ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/" - install -m 0644 ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub" - install -m 0644 ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub" - chown -R ${cfg.user}:${cfg.group} ${home} + install -m 0640 -o ${cfg.user} -g ${cfg.group} ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/" + install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub" + install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub" ''; serviceConfig = { |