Merge branch 'release/5.1.3'

webdevops · May 25, 2016 · a62566c · a62566c
2 parents 1343db2 + e2f7977
commit a62566c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 PHP Docker Boilerplate Changelog
 ==================================
 
+5.1.3 - 2016-05-25
+------------------
+- Fix nginx vhost configuration (modular WebDevOps image design)
+
 5.1.2 - 2016-05-25
 ------------------
 - Fix typo in Docker image names (duplicate -dev)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Dockerized TYPO3 project boilerplate
 
-[![latest v5.1.2](https://img.shields.io/badge/latest-v5.1.2-green.svg?style=flat)](https://github.com/webdevops/TYPO3-docker-boilerplate/releases/tag/5.1.2)
+[![latest v5.1.3](https://img.shields.io/badge/latest-v5.1.3-green.svg?style=flat)](https://github.com/webdevops/TYPO3-docker-boilerplate/releases/tag/5.1.3)
 ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/webdevops/typo3-docker-boilerplate.svg)](http://isitmaintained.com/project/webdevops/typo3-docker-boilerplate "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/webdevops/typo3-docker-boilerplate.svg)](http://isitmaintained.com/project/webdevops/typo3-docker-boilerplate "Percentage of issues still open")

diff --git a/provision/roles/boilerplate-main/templates/nginx/vhost.conf.j2 b/provision/roles/boilerplate-main/templates/nginx/vhost.conf.j2
@@ -9,6 +9,7 @@ server {
     listen  80;
 
     server_name  {{ vhost.serverName }} {{ vhost.serverAlias }};
+
     access_log   /dev/stdout;
     error_log    /dev/stdout info;
 
@@ -17,19 +18,6 @@ server {
 
     client_max_body_size 50m;
 
-    location / {
-        try_files $uri $uri/ /{{ vhost.documentIndex|default('<DOCUMENT_INDEX>') }}?$query_string;
-    }
-
-    location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass php;
-        include fastcgi_params;
-
-        fastcgi_param SCRIPT_FILENAME     $request_filename;
-        fastcgi_read_timeout 1000;
-    }
-
     include /opt/docker/etc/nginx/vhost.common.d/*.conf;
 }
 
@@ -41,6 +29,7 @@ server {
     listen  443;
 
     server_name  {{ vhost.serverName }} {{ vhost.serverAlias }};
+
     access_log   /dev/stdout;
     error_log    /dev/stdout info;
 
@@ -49,19 +38,6 @@ server {
 
     client_max_body_size 50m;
 
-    location / {
-        try_files $uri $uri/ /{{ vhost.documentIndex|default('<DOCUMENT_INDEX>') }}?$query_string;
-    }
-
-    location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass php;
-        include fastcgi_params;
-
-        fastcgi_param SCRIPT_FILENAME     $request_filename;
-        fastcgi_read_timeout 1000;
-    }
-
     include /opt/docker/etc/nginx/vhost.common.d/*.conf;
     include /opt/docker/etc/nginx/vhost.ssl.conf;
 }