Merge branch 'feature/GITHUB-25' into develop

Author: mblaschke

docker-env.yml

@@ -1,4 +1,5 @@
-DOCUMENT_ROOT=htdocs/
+DOCUMENT_ROOT=code/
+DOCUMENT_INDEX=index.php
 
 TYPO3_CONTEXT=Development/Docker
 FLOW_CONTEXT=Development/Docker

docker/httpd/conf/vhost.conf

@@ -13,7 +13,7 @@ SetEnv TYPO3_CONTEXT    "<TYPO3_CONTEXT>"
 SetEnv FLOW_CONTEXT     "<FLOW_CONTEXT>"
 SetEnv FLOW_REWRITEURLS "<FLOW_REWRITEURLS>"
 
-DirectoryIndex index.html index.htm index.php
+DirectoryIndex <DOCUMENT_INDEX> index.html index.htm
 
 DocumentRoot "<DOCUMENT_ROOT>"
 <Directory "<DOCUMENT_ROOT>">

docker/httpd/entrypoint.sh

@@ -25,6 +25,7 @@ DOCUMENT_ROOT=$(readlink -f "/docker/$DOCUMENT_ROOT")
 
 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@<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

docker/nginx/conf/vhost.conf

@@ -6,12 +6,12 @@ server {
     error_log    /dev/stdout info;
 
     root "<DOCUMENT_ROOT>";
-    index index.php;
+    index <DOCUMENT_INDEX>;
 
     client_max_body_size 50m;
 
     location / {
-        try_files $uri $uri/ /index.php?$query_string;
+        try_files $uri $uri/ /<DOCUMENT_INDEX>?$query_string;
     }
 
     location ~ \.php$ {

docker/nginx/entrypoint.sh

@@ -10,6 +10,7 @@ DOCUMENT_ROOT=$(readlink -f "/docker/$DOCUMENT_ROOT")
 rm -f -- /etc/nginx/conf.d/*.conf
 cp /opt/docker/vhost.conf /etc/nginx/conf.d/vhost.conf
 /bin/sed -i "s@<DOCUMENT_ROOT>@${DOCUMENT_ROOT}@"         /etc/nginx/conf.d/vhost.conf
+/bin/sed -i "s@<DOCUMENT_INDEX>@${DOCUMENT_INDEX}@"       /etc/nginx/conf.d/vhost.conf
 /bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@"         /etc/nginx/conf.d/vhost.conf
 /bin/sed -i "s@<FLOW_CONTEXT>@${FLOW_CONTEXT}@"           /etc/nginx/conf.d/vhost.conf
 /bin/sed -i "s@<FLOW_REWRITEURLS>@${FLOW_REWRITEURLS}@"   /etc/nginx/conf.d/vhost.conf