diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-11 11:17:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-11 11:17:04 +0100 |
commit | 11c18faa4e4ab42bcb926e45b89811eb74be411d (patch) | |
tree | c57725a088161addc8d6ec40fbd4ccb68692bada /nixos/modules/services/web-servers | |
parent | e9853444c744771772cd1cc8eb85db579fca213b (diff) | |
parent | 2d8d8415c0c780307bcff62d1ba63f7ada46d1cb (diff) | |
download | nixlib-11c18faa4e4ab42bcb926e45b89811eb74be411d.tar nixlib-11c18faa4e4ab42bcb926e45b89811eb74be411d.tar.gz nixlib-11c18faa4e4ab42bcb926e45b89811eb74be411d.tar.bz2 nixlib-11c18faa4e4ab42bcb926e45b89811eb74be411d.tar.lz nixlib-11c18faa4e4ab42bcb926e45b89811eb74be411d.tar.xz nixlib-11c18faa4e4ab42bcb926e45b89811eb74be411d.tar.zst nixlib-11c18faa4e4ab42bcb926e45b89811eb74be411d.zip |
Merge pull request #85862 from Izorkin/nginx-paths
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 8d49dc66eb1a..1e9cda7e4785 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -187,7 +187,7 @@ let then "/etc/nginx/nginx.conf" else configFile; - execCommand = "${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}'"; + execCommand = "${cfg.package}/bin/nginx -c '${configPath}'"; vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: let @@ -463,13 +463,6 @@ in ''; }; - stateDir = mkOption { - default = "/var/spool/nginx"; - description = " - Directory holding all state for nginx to run. - "; - }; - user = mkOption { type = types.str; default = "nginx"; @@ -636,6 +629,13 @@ in }; }; + imports = [ + (mkRemovedOptionModule [ "services" "nginx" "stateDir" ] '' + The Nginx log directory has been moved to /var/log/nginx, the cache directory + to /var/cache/nginx. The option services.nginx.stateDir has been removed. + '') + ]; + config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test @@ -680,12 +680,6 @@ in } ]; - systemd.tmpfiles.rules = [ - "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" - "d '${cfg.stateDir}/logs' 0750 ${cfg.user} ${cfg.group} - -" - "Z '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" - ]; - systemd.services.nginx = { description = "Nginx Web Server"; wantedBy = [ "multi-user.target" ]; @@ -708,6 +702,12 @@ in # Runtime directory and mode RuntimeDirectory = "nginx"; RuntimeDirectoryMode = "0750"; + # Cache directory and mode + CacheDirectory = "nginx"; + CacheDirectoryMode = "0750"; + # Logs directory and mode + LogsDirectory = "nginx"; + LogsDirectoryMode = "0750"; # Capabilities AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; }; |