diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-06-03 16:00:27 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-06-16 22:43:58 +0200 |
| commit | a97bef3e8c58334a859a76bdf8118cf071a894d8 (patch) | |
| tree | 49487ceba8c3457867b01683f2a2b2da3954433b /nixos/modules | |
| parent | 76c2c0c499c6472cd2fbed81899dd2996bb16c07 (diff) | |
| download | nixlib-a97bef3e8c58334a859a76bdf8118cf071a894d8.tar nixlib-a97bef3e8c58334a859a76bdf8118cf071a894d8.tar.gz nixlib-a97bef3e8c58334a859a76bdf8118cf071a894d8.tar.bz2 nixlib-a97bef3e8c58334a859a76bdf8118cf071a894d8.tar.lz nixlib-a97bef3e8c58334a859a76bdf8118cf071a894d8.tar.xz nixlib-a97bef3e8c58334a859a76bdf8118cf071a894d8.tar.zst nixlib-a97bef3e8c58334a859a76bdf8118cf071a894d8.zip | |
nixos/nginx: fix group and stateDir permissions
furthermore, I don't think adding nginx to systemPackages is of any use.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index ff94ee42d28d..7c2d3a42973a 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -84,8 +84,6 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ nginx ]; - # TODO: test user supplied config file pases syntax test systemd.services.nginx = { @@ -96,6 +94,7 @@ in preStart = '' mkdir -p ${cfg.stateDir}/logs + chmod 700 ${cfg.stateDir} chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} ''; serviceConfig = { @@ -105,7 +104,7 @@ in users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton { name = "nginx"; - group = "nginx"; + group = cfg.group; uid = config.ids.uids.nginx; }); |