apache-httpd: Make 2.4 the default
The NixOS 14.11 release is a good time to finally make 2.4 the default.
This commit is contained in:
parent
85d23f5292
commit
b3eb981a95
|
@ -11,6 +11,19 @@ following incompatible changes:
|
||||||
|
|
||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
|
|
||||||
|
<listitem><para>The default version of Apache httpd is now 2.4. If
|
||||||
|
you use the <option>extraConfig</option> option to pass literal
|
||||||
|
Apache configuration text, you may need to update it — see <link
|
||||||
|
xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s
|
||||||
|
documentation</link> for details. If you wish to continue to use
|
||||||
|
httpd 2.2, add the following line to your NixOS configuration:
|
||||||
|
|
||||||
|
<programlisting>
|
||||||
|
services.httpd.package = pkgs.apacheHttpd_2_2;
|
||||||
|
</programlisting>
|
||||||
|
|
||||||
|
</para></listitem>
|
||||||
|
|
||||||
<listitem><para>The host side of a container virtual Ethernet pair
|
<listitem><para>The host side of a container virtual Ethernet pair
|
||||||
is now called <literal>ve-<replaceable>container-name</replaceable></literal>
|
is now called <literal>ve-<replaceable>container-name</replaceable></literal>
|
||||||
rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
|
rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
|
||||||
|
|
|
@ -109,6 +109,8 @@ let
|
||||||
"mpm_${mainCfg.multiProcessingModule}"
|
"mpm_${mainCfg.multiProcessingModule}"
|
||||||
"authz_core"
|
"authz_core"
|
||||||
"unixd"
|
"unixd"
|
||||||
|
"cache" "cache_disk"
|
||||||
|
"slotmem_shm"
|
||||||
]
|
]
|
||||||
++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
|
++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
|
||||||
++ optional enableSSL "ssl"
|
++ optional enableSSL "ssl"
|
||||||
|
@ -420,8 +422,7 @@ in
|
||||||
|
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
|
default = pkgs.apacheHttpd;
|
||||||
example = literalExample "pkgs.apacheHttpd_2_4";
|
|
||||||
description = ''
|
description = ''
|
||||||
Overridable attribute of the Apache HTTP Server package to use.
|
Overridable attribute of the Apache HTTP Server package to use.
|
||||||
'';
|
'';
|
||||||
|
@ -593,11 +594,11 @@ in
|
||||||
###### implementation
|
###### implementation
|
||||||
|
|
||||||
config = mkIf config.services.httpd.enable {
|
config = mkIf config.services.httpd.enable {
|
||||||
|
|
||||||
assertions = [ { assertion = mainCfg.enableSSL == true
|
assertions = [ { assertion = mainCfg.enableSSL == true
|
||||||
-> mainCfg.sslServerCert != null
|
-> mainCfg.sslServerCert != null
|
||||||
&& mainCfg.sslServerKey != null;
|
&& mainCfg.sslServerKey != null;
|
||||||
message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; }
|
message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
|
||||||
];
|
];
|
||||||
|
|
||||||
users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton
|
users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") (singleton
|
||||||
|
|
|
@ -22,20 +22,19 @@ in
|
||||||
|
|
||||||
{ services.httpd.enable = true;
|
{ services.httpd.enable = true;
|
||||||
services.httpd.adminAddr = "bar@example.org";
|
services.httpd.adminAddr = "bar@example.org";
|
||||||
services.httpd.extraModules = ["proxy_balancer"];
|
services.httpd.extraModules = [ "proxy_balancer" "lbmethod_byrequests" ];
|
||||||
|
|
||||||
services.httpd.extraConfig =
|
services.httpd.extraConfig =
|
||||||
''
|
''
|
||||||
ExtendedStatus on
|
ExtendedStatus on
|
||||||
|
|
||||||
<Location /server-status>
|
<Location /server-status>
|
||||||
Order deny,allow
|
Require all granted
|
||||||
Allow from all
|
|
||||||
SetHandler server-status
|
SetHandler server-status
|
||||||
</Location>
|
</Location>
|
||||||
|
|
||||||
<Proxy balancer://cluster>
|
<Proxy balancer://cluster>
|
||||||
Allow from all
|
Require all granted
|
||||||
BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0
|
BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0
|
||||||
BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0
|
BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0
|
||||||
</Proxy>
|
</Proxy>
|
||||||
|
|
|
@ -7342,7 +7342,7 @@ let
|
||||||
|
|
||||||
rdf4store = callPackage ../servers/http/4store { };
|
rdf4store = callPackage ../servers/http/4store { };
|
||||||
|
|
||||||
apacheHttpd = pkgs.apacheHttpd_2_2;
|
apacheHttpd = pkgs.apacheHttpd_2_4;
|
||||||
|
|
||||||
apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix {
|
apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix {
|
||||||
sslSupport = true;
|
sslSupport = true;
|
||||||
|
|
Loading…
Reference in a new issue