From 345d5eb9dbac49569b4173b749c971488a7d2500 Mon Sep 17 00:00:00 2001
From: Sam McLeod <smj@fastmail.com>
Date: Sat, 21 Feb 2015 15:49:58 +1100
Subject: [PATCH] move docker fies, fix readme relating to docker port

---
 Dockerfile                                    | 6 +++---
 README.md                                     | 2 +-
 nginx-site.conf => docker/nginx-site.conf     | 0
 php-fpm-pool.conf => docker/php-fpm-pool.conf | 0
 supervisord.conf => docker/supervisord.conf   | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename nginx-site.conf => docker/nginx-site.conf (100%)
 rename php-fpm-pool.conf => docker/php-fpm-pool.conf (100%)
 rename supervisord.conf => docker/supervisord.conf (100%)

diff --git a/Dockerfile b/Dockerfile
index b138fdca..555ddf2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,12 +40,12 @@ RUN sed -i "s/'key' => '\w.*/'key' => 'f20d3e5ae02125a94bd60203a4edfbde',/" app/
 # copy the various nginx and supervisor conf (to handle both fpm and nginx)
 RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.conf ;\
     echo "daemon off;" >> /etc/nginx/nginx.conf ;\
-    ln -sf /var/www/html/php-fpm-pool.conf /etc/php5/fpm/pool.d/www.conf ;\
-    rm -f /etc/nginx/sites-enabled/* && rm -f /etc/nginx/conf.d/* && ln -sf /var/www/html/nginx-site.conf /etc/nginx/conf.d/default.conf
+    mv /var/www/html/docker/php-fpm-pool.conf /etc/php5/fpm/pool.d/www.conf ;\
+    rm -f /etc/nginx/sites-enabled/* && rm -f /etc/nginx/conf.d/* && mv /var/www/html/docker/nginx-site.conf /etc/nginx/conf.d/default.conf
 
 RUN curl -sS https://getcomposer.org/installer | php && php composer.phar install --no-dev -o
 
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
 
 EXPOSE 8000
 
diff --git a/README.md b/README.md
index 639dc61e..8814147a 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ $ docker run --link mysql:mysql -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e
 Run Cachet:
 
 ```bash
-$ docker run -d --name cachet --link mysql:mysql -p 80:80 -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e DB_USERNAME=$DB_USERNAME -e DB_PASSWORD=$DB_PASSWORD cachethq/cachet:latest
+$ docker run -d --name cachet --link mysql:mysql -p 80:8000 -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e DB_USERNAME=$DB_USERNAME -e DB_PASSWORD=$DB_PASSWORD cachethq/cachet:latest
 ```
 
 Now go to `http://<ipdockerisboundto>/setup` and have fun!
diff --git a/nginx-site.conf b/docker/nginx-site.conf
similarity index 100%
rename from nginx-site.conf
rename to docker/nginx-site.conf
diff --git a/php-fpm-pool.conf b/docker/php-fpm-pool.conf
similarity index 100%
rename from php-fpm-pool.conf
rename to docker/php-fpm-pool.conf
diff --git a/supervisord.conf b/docker/supervisord.conf
similarity index 100%
rename from supervisord.conf
rename to docker/supervisord.conf