movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/httpd: cleanup old apache2.2 syntax

Browse source
This commit is contained in:
Aaron Andersen 2019-04-20 07:32:55 -04:00
parent ca40b73fa2
commit e5b583bef4
1 changed files with 13 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

55
nixos/modules/services/web-servers/apache-httpd/default.nix
View file

@ -8,8 +8,6 @@ let
httpd = mainCfg.package.out; httpd = mainCfg.package.out;
version24 = !versionOlder httpd.version "2.4";
httpdConf = mainCfg.configFile; httpdConf = mainCfg.configFile;
php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ }; php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
@ -107,11 +105,10 @@ let
"auth_basic" "auth_digest" "auth_basic" "auth_digest"
# Authentication: is the user who he claims to be? # Authentication: is the user who he claims to be?
"authn_file" "authn_dbm" "authn_anon" "authn_file" "authn_dbm" "authn_anon" "authn_core"
(if version24 then "authn_core" else "authn_alias")
# Authorization: is the user allowed access? # Authorization: is the user allowed access?
"authz_user" "authz_groupfile" "authz_host" "authz_user" "authz_groupfile" "authz_host" "authz_core"
# Other modules. # Other modules.
"ext_filter" "include" "log_config" "env" "mime_magic" "ext_filter" "include" "log_config" "env" "mime_magic"
@ -119,14 +116,9 @@ let
"mime" "dav" "status" "autoindex" "asis" "info" "dav_fs" "mime" "dav" "status" "autoindex" "asis" "info" "dav_fs"
"vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling" "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
"userdir" "alias" "rewrite" "proxy" "proxy_http" "userdir" "alias" "rewrite" "proxy" "proxy_http"
] "unixd" "cache" "cache_disk" "slotmem_shm" "socache_shmcb"
++ optionals version24 [
"mpm_${mainCfg.multiProcessingModule}" "mpm_${mainCfg.multiProcessingModule}"
"authz_core"
"unixd"
"cache" "cache_disk"
"slotmem_shm"
"socache_shmcb"
# For compatibility with old configurations, the new module mod_access_compat is provided. # For compatibility with old configurations, the new module mod_access_compat is provided.
"access_compat" "access_compat"
] ]
@ -135,19 +127,8 @@ let
++ extraApacheModules; ++ extraApacheModules;
allDenied = if version24 then '' allDenied = "Require all denied";
Require all denied allGranted = "Require all granted";
'' else ''
Order deny,allow
Deny from all
'';
allGranted = if version24 then ''
Require all granted
'' else ''
Order allow,deny
Allow from all
'';
loggingConf = (if mainCfg.logFormat != "none" then '' loggingConf = (if mainCfg.logFormat != "none" then ''
@ -180,9 +161,9 @@ let
sslConf = '' sslConf = ''
SSLSessionCache ${if version24 then "shmcb" else "shm"}:${mainCfg.stateDir}/ssl_scache(512000) SSLSessionCache shmcb:${mainCfg.stateDir}/ssl_scache(512000)
${if version24 then "Mutex" else "SSLMutex"} posixsem Mutex posixsem
SSLRandomSeed startup builtin SSLRandomSeed startup builtin
SSLRandomSeed connect builtin SSLRandomSeed connect builtin
@ -322,9 +303,7 @@ let
ServerRoot ${httpd} ServerRoot ${httpd}
${optionalString version24 '' DefaultRuntimeDir ${mainCfg.stateDir}/runtime
DefaultRuntimeDir ${mainCfg.stateDir}/runtime
''}
PidFile ${mainCfg.stateDir}/httpd.pid PidFile ${mainCfg.stateDir}/httpd.pid
@ -397,14 +376,6 @@ let
# Generate directives for the main server. # Generate directives for the main server.
${perServerConf true mainCfg} ${perServerConf true mainCfg}
# Always enable virtual hosts; it doesn't seem to hurt.
${let
listen = concatMap getListen allHosts;
uniqueListen = uniqList {inputList = listen;};
directives = concatMapStrings (listen: "NameVirtualHost ${listenToString listen}\n") uniqueListen;
in optionalString (!version24) directives
}
${let ${let
makeVirtualHost = vhost: '' makeVirtualHost = vhost: ''
<VirtualHost ${concatStringsSep " " (map listenToString (getListen vhost))}> <VirtualHost ${concatStringsSep " " (map listenToString (getListen vhost))}>
@ -717,10 +688,10 @@ in
'' ''
mkdir -m 0750 -p ${mainCfg.stateDir} mkdir -m 0750 -p ${mainCfg.stateDir}
[ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir} [ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir}
${optionalString version24 ''
mkdir -m 0750 -p "${mainCfg.stateDir}/runtime" mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
[ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime" [ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
''}
mkdir -m 0700 -p ${mainCfg.logDir} mkdir -m 0700 -p ${mainCfg.logDir}
# Get rid of old semaphores. These tend to accumulate across # Get rid of old semaphores. These tend to accumulate across