Improved apache configuration

Improved logging
Added better, faster error documents (default)
Added vhost (TYPO3 doesn't need trustedHostsPattern anymore)

Author: mblaschke

docker/httpd/conf/vhost.conf

@@ -1,3 +1,4 @@
+LoadModule logio_module      modules/mod_logio.so
 LoadModule deflate_module    modules/mod_deflate.so
 LoadModule expires_module    modules/mod_expires.so
 LoadModule headers_module    modules/mod_headers.so
@@ -14,11 +15,11 @@ TimeOut      1000
 ProxyTimeout 1000
 
 <FilesMatch \.php$>
-    SetHandler "proxy:fcgi://main:<FPM_PORT>"
+  SetHandler "proxy:fcgi://main:<FPM_PORT>"
 </FilesMatch>
 
 <Proxy "fcgi://main:<FPM_PORT>">
-    ProxySet timeout=1000 disablereuse=on
+  ProxySet timeout=1000 disablereuse=on
 </Proxy>
 
 SetEnv TYPO3_CONTEXT    "<TYPO3_CONTEXT>"
@@ -29,7 +30,38 @@ DirectoryIndex <DOCUMENT_INDEX> index.html index.htm
 
 DocumentRoot "<DOCUMENT_ROOT>"
 <Directory "<DOCUMENT_ROOT>">
-    Options Indexes FollowSymLinks
-    AllowOverride All
-    Require all granted
+  Options Indexes FollowSymLinks
+  AllowOverride All
+  Require all granted
 </Directory>
+
+LogFormat "[httpd:access] %V:%p %h %l %u %t \"%r\" %>s bytesIn:%I bytesOut:%O reqTime:%T" dockerlog
+CustomLog /proc/self/fd/1 dockerlog
+
+#######################################
+# Faster error documents
+#######################################
+<Location ~ "(\.jpeg|\.jpg|\.gif|\.png|\.ico|\.js|\.css|\.map|\.json|\.xml|robots\.txt)$">
+  ErrorDocument 400 "400 Bad Request"
+  ErrorDocument 401 "401 Unauthorized"
+  ErrorDocument 403 "403 Forbidden"
+  ErrorDocument 404 "404 Not Found"
+  ErrorDocument 405 "405 Method Not Allowed"
+
+  ErrorDocument 500 "500 Internal Server Error"
+  ErrorDocument 501 "501 Not Implemented"
+  ErrorDocument 502 "502 Bad Gateway"
+  ErrorDocument 503 "503 Service Unavailable"
+</Location>
+
+#######################################
+# Vhost
+#######################################
+NameVirtualHost *:80
+<VirtualHost *:80>
+  ServerName docker.vm
+  ServerAlias <ALIAS_DOMAIN>
+  DocumentRoot "<DOCUMENT_ROOT>"
+
+  UseCanonicalName Off
+</VirtualHost>

docker/httpd/entrypoint.sh

@@ -15,21 +15,29 @@ echo "
 Include conf/docker-vhost.conf
 " >> /usr/local/apache2/conf/httpd.conf
 
+sed -i 's/CustomLog/#CustomLog/' -- /usr/local/apache2/conf/httpd.conf
+
 ###################
 # vhost
 ###################
 
 # Detect correct path of document root
 DOCUMENT_ROOT=$(readlink -f "/docker/$DOCUMENT_ROOT")
 
+ALIAS_DOMAIN=""
+for DOMAIN in $DNS_DOMAIN; do
+    ALIAS_DOMAIN="${ALIAS_DOMAIN} *.${DOMAIN}"
+done
+
 cp /usr/local/apache2/conf/.docker-vhost.conf.original   /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<DOCUMENT_ROOT>@${DOCUMENT_ROOT}@"        /usr/local/apache2/conf/docker-vhost.conf
-/bin/sed -i "s@<DOCUMENT_INDEX>@${DOCUMENT_INDEX}@"        /usr/local/apache2/conf/docker-vhost.conf
+/bin/sed -i "s@<DOCUMENT_INDEX>@${DOCUMENT_INDEX}@"      /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@"        /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<FLOW_CONTEXT>@${FLOW_CONTEXT}@"          /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<FLOW_REWRITEURLS>@${FLOW_REWRITEURLS}@"  /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<FPM_HOST>@${MAIN_PORT_9000_TCP_ADDR}@"   /usr/local/apache2/conf/docker-vhost.conf
 /bin/sed -i "s@<FPM_PORT>@${MAIN_PORT_9000_TCP_PORT}@"   /usr/local/apache2/conf/docker-vhost.conf
+/bin/sed -i "s@<ALIAS_DOMAIN>@${ALIAS_DOMAIN}@"          /usr/local/apache2/conf/docker-vhost.conf
 
 #############################
 ## COMMAND