From 8cf1a1283b7cf19aeb446972a5359ae8c71cafb1 Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 25 May 2016 16:22:21 +0200 Subject: [PATCH 1/2] Update and fix nginx vhost configuration file --- CHANGELOG.md | 4 +++ .../templates/nginx/vhost.conf.j2 | 28 ++----------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 477102c..9290a2e 100644 --- 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/provision/roles/boilerplate-main/templates/nginx/vhost.conf.j2 b/provision/roles/boilerplate-main/templates/nginx/vhost.conf.j2 index e2fa150..58340ea 100644 --- 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('') }}?$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('') }}?$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; } From 89f8026ab9ccde532b24c583cef1987a6cac8eda Mon Sep 17 00:00:00 2001 From: Markus Blaschke Date: Wed, 25 May 2016 16:31:34 +0200 Subject: [PATCH 2/2] Version bump --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c22e4b5..37b1c2b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dockerized PHP web project boilerplate -[![latest v5.1.2](https://img.shields.io/badge/latest-v5.1.2-green.svg?style=flat)](https://github.com/webdevops/php-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/php-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/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Percentage of issues still open")