Move to apache 2.4

software/apache-frontend/README.apache_frontend.rst

@@ -461,6 +461,6 @@ Solution 2 (IPv6 only)
 
 It is also possible to directly allow the service to listen on 80 and 443 ports using the following command:
 
-  setcap 'cap_net_bind_service=+ep' /opt/slapgrid/$APACHE_FRONTEND_SOFTWARE_RELEASE_MD5/parts/apache-2.2/bin/httpd
+  setcap 'cap_net_bind_service=+ep' /opt/slapgrid/$APACHE_FRONTEND_SOFTWARE_RELEASE_MD5/parts/apache/bin/httpd
 
 Then specify in the instance parameters "port" and "plain_http_port" to be 443 and 80, respectively.

software/apache-frontend/common.cfg

@@ -27,8 +27,8 @@ parts +=
   template
   template-apache-frontend
   template-apache-replicate
-  apache-2.2
-  apache-antiloris-apache-2.2
+  apache
+  apache-antiloris
 
   stunnel
 
@@ -56,7 +56,7 @@ mode = 0644
 [template-apache-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg
-md5sum = 6d437f8a3836484d42bf9bf8d747e201 
+md5sum = bc40f509f42c1de6f566e7b9c7ad5247
 output = ${buildout:directory}/template-apache-frontend.cfg
 mode = 0644
 
@@ -87,7 +87,7 @@ mode = 640
 [template-apache-frontend-configuration]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/apache.conf.in
-md5sum = 7d5f0f38e4dd81ff26f2499890b13315
+md5sum = bc03db7b1b3ff235d145b3cfac148559
 mode = 640
 
 [template-custom-slave-list]

software/apache-frontend/instance-apache-frontend.cfg

@@ -121,7 +121,7 @@ configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
 [frontend-configuration]
 template-log-access = ${template-log-access:target}
 log-access-configuration = $${directory:etc}/apache-log-access.conf
-apache-directory = ${apache-2.2:location}
+apache-directory = ${apache:location}
 apache-ipv6 = $${instance-parameter:ipv6-random}
 apache-https-port = $${instance-parameter:configuration.port}
 
@@ -202,7 +202,7 @@ extra-context =
 template = ${template-apache-frontend-configuration:target}
 rendered = $${apache-configuration:frontend-configuration}
 extra-context =
-    raw httpd_home ${apache-2.2:location}
+    raw httpd_home ${apache:location}
     key httpd_mod_ssl_cache_directory apache-directory:mod-ssl
     key domain instance-parameter:configuration.domain
     key document_root apache-directory:document-root
@@ -230,7 +230,7 @@ extra-context =
 
 [apache-frontend]
 recipe = slapos.cookbook:wrapper
-command-line = ${apache-2.2:location}/bin/httpd -f $${dynamic-apache-frontend-template:rendered} -DFOREGROUND
+command-line = ${apache:location}/bin/httpd -f $${dynamic-apache-frontend-template:rendered} -DFOREGROUND
 wrapper-path = $${directory:service}/frontend_apache
 wait-for-files =
 	       $${ca-frontend:cert-file}
@@ -260,7 +260,7 @@ error-log = $${directory:log}/frontend-apache-error.log
 pid-file = $${directory:run}/httpd.pid
 protected-path = /
 access-control-string = none
-frontend-configuration-verification = ${apache-2.2:location}/bin/httpd -Sf $${:frontend-configuration} > /dev/null
+frontend-configuration-verification = ${apache:location}/bin/httpd -Sf $${:frontend-configuration} > /dev/null
 frontend-graceful-command = $${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi
 
 # Comunication with ats
@@ -271,7 +271,7 @@ ssl-cache-through-port = 26012
 # Create wrapper for "apachectl conftest" in bin
 [configtest]
 recipe = slapos.cookbook:wrapper
-command-line = ${apache-2.2:location}/bin/httpd -f $${directory:etc}/apache_frontend.conf -t
+command-line = ${apache:location}/bin/httpd -f $${directory:etc}/apache_frontend.conf -t
 wrapper-path = $${directory:bin}/apache-configtest
 
 [certificate-authority]

software/apache-frontend/templates/apache.conf.in

@@ -44,8 +44,7 @@ CustomLog "{{ access_log }}" combined
 </Directory>
 
 <Directory {{ document_root }}>
-  Order Allow,Deny
-  Allow from All
+  Require all granted
   Options -Indexes
   ErrorDocument 404 /notfound.html
   RewriteEngine on
@@ -71,7 +70,8 @@ LoadModule negotiation_module {{ httpd_home }}/modules/mod_negotiation.so
 LoadModule rewrite_module     {{ httpd_home }}/modules/mod_rewrite.so
 LoadModule headers_module     {{ httpd_home }}/modules/mod_headers.so
 LoadModule cache_module       {{ httpd_home }}/modules/mod_cache.so
-LoadModule mem_cache_module   {{ httpd_home }}/modules/mod_mem_cache.so
+LoadModule cache_socache_module   {{ httpd_home }}/modules/mod_cache_socache.so
+LoadModule socache_shmcb_module   {{ httpd_home }}/modules/mod_socache_shmcb.so
 LoadModule antiloris_module   {{ httpd_home }}/modules/mod_antiloris.so
 LoadModule alias_module       {{ httpd_home }}/modules/mod_alias.so
 LoadModule autoindex_module   {{ httpd_home }}/modules/mod_autoindex.so