Merge pull request #1708 from jzelinskie/nginxdir

move nginx
2016-08-10 17:53:22 -04:00 · 2016-08-10 17:53:22 -04:00 · 4ea6f724c4
commit 4ea6f724c4
parent cbfa77b114 6a681bb748
9 changed files with 2 additions and 2 deletions
--- a/conf/init/service/nginx/run
+++ b/conf/init/service/nginx/run
@ -5,10 +5,10 @@ echo 'Starting nginx'
 if [ -f /conf/stack/ssl.key ]
 then
  echo "Using HTTPS"
-  /usr/sbin/nginx -c /conf/nginx.conf
+  /usr/sbin/nginx -c /conf/nginx/nginx.conf
 else
  echo "No SSL key provided, using HTTP"
-  /usr/sbin/nginx -c /conf/nginx-nossl.conf
+  /usr/sbin/nginx -c /conf/nginx/nginx-nossl.conf
 fi

 echo 'Nginx exited'
--- a/conf/nginx/dhparams.pem
+++ b/conf/nginx/dhparams.pem
--- a/conf/nginx/hosted-http-base.conf
+++ b/conf/nginx/hosted-http-base.conf
--- a/conf/nginx/http-base.conf
+++ b/conf/nginx/http-base.conf
--- a/conf/nginx/nginx-nossl.conf
+++ b/conf/nginx/nginx-nossl.conf
--- a/conf/nginx/nginx.conf
+++ b/conf/nginx/nginx.conf
--- a/conf/nginx/rate-limiting.conf
+++ b/conf/nginx/rate-limiting.conf
--- a/conf/nginx/root-base.conf
+++ b/conf/nginx/root-base.conf
--- a/conf/nginx/server-base.conf
+++ b/conf/nginx/server-base.conf