public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apache-httpd: Simplify all versionOlder calls.

Browse Source 
We now just have a simple attribute called "version24" which replaces all those
pesky versionOlder that were spreading throughout the file and makes things way
more readable.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2012-10-17 17:47:30 +02:00
parent 919e6e55a9
commit f9831a94c9
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/services/web-servers/apache-httpd/default.nix
View File

@ -8,6 +8,8 @@ let
httpd = mainCfg.package; httpd = mainCfg.package;
version24 = !versionOlder httpd.version "2.4";
httpdConf = mainCfg.configFile; httpdConf = mainCfg.configFile;
php = pkgs.php.override { apacheHttpd = httpd; }; php = pkgs.php.override { apacheHttpd = httpd; };
@ -102,7 +104,7 @@ let
# 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"
(if versionOlder httpd.version "2.3" then "authn_alias" else "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"
@ -114,7 +116,7 @@ let
"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"
] ]
++ optionals (!versionOlder httpd.version "2.4") [ ++ optionals version24 [
"mpm_${mainCfg.multiProcessingModule}" "mpm_${mainCfg.multiProcessingModule}"
"authz_core" "authz_core"
"unixd" "unixd"
@ -124,18 +126,18 @@ let
++ extraApacheModules; ++ extraApacheModules;
allDenied = if versionOlder httpd.version "2.4" then '' allDenied = if version24 then ''
Require all denied
'' else ''
Order deny,allow Order deny,allow
Deny from all Deny from all
'' else ''
Require all denied
''; '';
allGranted = if versionOlder httpd.version "2.4" then '' allGranted = if version24 then ''
Require all granted
'' else ''
Order allow,deny Order allow,deny
Allow from all Allow from all
'' else ''
Require all granted
''; '';
@ -303,7 +305,7 @@ let
ServerRoot ${httpd} ServerRoot ${httpd}
${optionalString (!versionOlder httpd.version "2.4") '' ${optionalString version24 ''
DefaultRuntimeDir ${mainCfg.stateDir}/runtime DefaultRuntimeDir ${mainCfg.stateDir}/runtime
''} ''}
@ -377,9 +379,8 @@ let
${let ${let
ports = map getPort allHosts; ports = map getPort allHosts;
uniquePorts = uniqList {inputList = ports;}; uniquePorts = uniqList {inputList = ports;};
isNeeded = versionOlder httpd.version "2.4";
directives = concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts; directives = concatMapStrings (port: "NameVirtualHost *:${toString port}\n") uniquePorts;
in optionalString isNeeded directives in optionalString (!version24) directives
} }
${let ${let
@ -640,7 +641,7 @@ in
'' ''
mkdir -m 0750 -p ${mainCfg.stateDir} mkdir -m 0750 -p ${mainCfg.stateDir}
chown root.${mainCfg.group} ${mainCfg.stateDir} chown root.${mainCfg.group} ${mainCfg.stateDir}
${optionalString (!versionOlder httpd.version "2.4") '' ${optionalString version24 ''
mkdir -m 0750 -p "${mainCfg.stateDir}/runtime" mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime" chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
''} ''}