diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-11-04 07:32:28 -0500 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-11-04 07:32:28 -0500 |
commit | 9c28599bfe4e3efdabd9fbddcbed1f690a96d9a1 (patch) | |
tree | eaa5c770559ad721d9ad35093dfc265b6954bd8a /nixos/modules/services/web-servers | |
parent | 86ccc63008204a8ab5a7a52645bfb4ade3857818 (diff) | |
download | nixpkgs-9c28599bfe4e3efdabd9fbddcbed1f690a96d9a1.tar nixpkgs-9c28599bfe4e3efdabd9fbddcbed1f690a96d9a1.tar.gz nixpkgs-9c28599bfe4e3efdabd9fbddcbed1f690a96d9a1.tar.bz2 nixpkgs-9c28599bfe4e3efdabd9fbddcbed1f690a96d9a1.tar.lz nixpkgs-9c28599bfe4e3efdabd9fbddcbed1f690a96d9a1.tar.xz nixpkgs-9c28599bfe4e3efdabd9fbddcbed1f690a96d9a1.tar.zst nixpkgs-9c28599bfe4e3efdabd9fbddcbed1f690a96d9a1.zip |
nixos/httpd: drop stateDir option, hardcode to /run/httpd
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 99304d0e48a..8eacb1f9a34 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -6,6 +6,8 @@ let mainCfg = config.services.httpd; + runtimeDir = "/run/httpd"; + httpd = mainCfg.package.out; httpdConf = mainCfg.configFile; @@ -98,7 +100,7 @@ let sslConf = '' - SSLSessionCache shmcb:${mainCfg.stateDir}/ssl_scache(512000) + SSLSessionCache shmcb:${runtimeDir}/ssl_scache(512000) Mutex posixsem @@ -239,13 +241,13 @@ let ServerRoot ${httpd} - DefaultRuntimeDir ${mainCfg.stateDir}/runtime + DefaultRuntimeDir ${runtimeDir}/runtime - PidFile ${mainCfg.stateDir}/httpd.pid + PidFile ${runtimeDir}/httpd.pid ${optionalString (mainCfg.multiProcessingModule != "prefork") '' # mod_cgid requires this. - ScriptSock ${mainCfg.stateDir}/cgisock + ScriptSock ${runtimeDir}/cgisock ''} <IfModule prefork.c> @@ -337,6 +339,7 @@ in imports = [ (mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") + (mkRemovedOptionModule [ "services" "httpd" "stateDir" ] "The httpd module now uses /run/httpd as a runtime directory.") ]; ###### interface @@ -431,16 +434,6 @@ in ''; }; - stateDir = mkOption { - type = types.path; - default = "/run/httpd"; - description = '' - Directory for Apache's transient runtime state (such as PID - files). It is created automatically. Note that the default, - <filename>/run/httpd</filename>, is deleted at boot time. - ''; - }; - virtualHosts = mkOption { type = types.listOf (types.submodule ( { options = import ./per-server-options.nix { @@ -611,12 +604,6 @@ in preStart = '' - mkdir -m 0750 -p ${mainCfg.stateDir} - [ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir} - - mkdir -m 0750 -p "${mainCfg.stateDir}/runtime" - [ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime" - mkdir -m 0700 -p ${mainCfg.logDir} # Get rid of old semaphores. These tend to accumulate across @@ -630,10 +617,13 @@ in serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}"; serviceConfig.ExecStop = "${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop"; serviceConfig.ExecReload = "${httpd}/bin/httpd -f ${httpdConf} -k graceful"; + serviceConfig.Group = mainCfg.group; serviceConfig.Type = "forking"; - serviceConfig.PIDFile = "${mainCfg.stateDir}/httpd.pid"; + serviceConfig.PIDFile = "${runtimeDir}/httpd.pid"; serviceConfig.Restart = "always"; serviceConfig.RestartSec = "5s"; + serviceConfig.RuntimeDirectory = "httpd httpd/runtime"; + serviceConfig.RuntimeDirectoryMode = "0750"; }; }; |