From d4509afd5fea68c14ca032d20e57a8843b8684d4 Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngineered.co.uk>
Date: Wed, 15 Jul 2015 10:02:14 +0000
Subject: [PATCH 1/4] updated supervisord location in start.sh script

---
 start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.sh b/start.sh
index 45c86d3..502c5b2 100644
--- a/start.sh
+++ b/start.sh
@@ -44,4 +44,4 @@ if [[ "$TEMPLATE_NGINX_HTML" != "0" ]] ; then
 fi
 
 # Start supervisord and services
-/usr/local/bin/supervisord -n -c /etc/supervisord.conf
+/usr/bin/supervisord -n -c /etc/supervisord.conf

From ffc9ee6f33d45ebb670fe1522edd99b6aa65add1 Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngineered.co.uk>
Date: Wed, 15 Jul 2015 10:18:49 +0000
Subject: [PATCH 2/4] No stdout on supervisor for the moment

---
 supervisord.conf | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/supervisord.conf b/supervisord.conf
index ff1ed36..45ec711 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -35,8 +35,3 @@ priority=10
 stdout_events_enabled=true
 stderr_events_enabled=true
 
-[eventlistener:stdout]
-command = supervisor_stdout
-buffer_size = 100
-events = PROCESS_LOG
-result_handler = supervisor_stdout:event_handler

From 1b13ce62c24102d4cfbe3ff48d21d05b9f002bd2 Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngineered.co.uk>
Date: Wed, 15 Jul 2015 10:47:08 +0000
Subject: [PATCH 3/4] changes in user for nginx and php-fpm

---
 Dockerfile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 01e91cb..4e2970c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,6 @@ rm -rf /usr/share/man/??_*
 RUN sed -i -e"s/worker_processes  1/worker_processes 5/" /etc/nginx/nginx.conf && \
 sed -i -e"s/keepalive_timeout\s*65/keepalive_timeout 2/" /etc/nginx/nginx.conf && \
 sed -i -e"s/keepalive_timeout 2/keepalive_timeout 2;\n\tclient_max_body_size 100m/" /etc/nginx/nginx.conf && \
-sed -i "s/.*conf\.d\/\*\.conf;.*/&\n    include \/etc\/nginx\/sites-enabled\/\*;/" /etc/nginx/nginx.conf && \
 echo "daemon off;" >> /etc/nginx/nginx.conf
 
 # tweak php-fpm config
@@ -46,12 +45,8 @@ sed -i -e "s/pm.min_spare_servers = 1/pm.min_spare_servers = 2/g" /etc/php5/fpm/
 sed -i -e "s/pm.max_spare_servers = 3/pm.max_spare_servers = 4/g" /etc/php5/fpm/pool.d/www.conf && \
 sed -i -e "s/pm.max_requests = 500/pm.max_requests = 200/g" /etc/php5/fpm/pool.d/www.conf
 
-# fix ownership of sock file for php-fpm as our version of nginx runs as nginx
-RUN sed -i -e "s/user = www-data/user = nginx/g" /etc/php5/fpm/pool.d/www.conf && \
-sed -i -e "s/group = www-data/group = nginx/g" /etc/php5/fpm/pool.d/www.conf && \
-sed -i -e "s/listen.owner = www-data/listen.owner = nginx/g" /etc/php5/fpm/pool.d/www.conf && \
-sed -i -e "s/listen.group = www-data/listen.group = nginx/g" /etc/php5/fpm/pool.d/www.conf && \
-sed -i -e "s/;listen.mode = 0660/listen.mode = 0750/g" /etc/php5/fpm/pool.d/www.conf && \
+# fix ownership of sock file for php-fpm
+RUN sed -i -e "s/;listen.mode = 0660/listen.mode = 0750/g" /etc/php5/fpm/pool.d/www.conf && \
 find /etc/php5/cli/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;
 
 # nginx site conf

From 941cdffc8f6cadb9a4a5b2cccc1dfe446d1e3ade Mon Sep 17 00:00:00 2001
From: Ric Harvey <ric@ngineered.co.uk>
Date: Wed, 15 Jul 2015 11:02:24 +0000
Subject: [PATCH 4/4] remove duplicate default nginx config

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4e2970c..183177f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,8 +51,7 @@ find /etc/php5/cli/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g
 
 # nginx site conf
 RUN rm -Rf /etc/nginx/conf.d/* && \
-mkdir -p /etc/nginx/sites-available/ && \
-mkdir -p /etc/nginx/sites-enabled/ && \
+rm -Rf /etc/nginx/sites-available/default && \
 mkdir -p /etc/nginx/ssl/
 ADD ./nginx-site.conf /etc/nginx/sites-available/default.conf
 RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/default.conf