From 6a681bb7484f4d041c9d583126cd16cc76f36385 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie+git@gmail.com>
Date: Wed, 10 Aug 2016 16:14:33 -0400
Subject: [PATCH] move nginx

---
 conf/init/service/nginx/run            | 4 ++--
 conf/{ => nginx}/dhparams.pem          | 0
 conf/{ => nginx}/hosted-http-base.conf | 0
 conf/{ => nginx}/http-base.conf        | 0
 conf/{ => nginx}/nginx-nossl.conf      | 0
 conf/{ => nginx}/nginx.conf            | 0
 conf/{ => nginx}/rate-limiting.conf    | 0
 conf/{ => nginx}/root-base.conf        | 0
 conf/{ => nginx}/server-base.conf      | 0
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename conf/{ => nginx}/dhparams.pem (100%)
 rename conf/{ => nginx}/hosted-http-base.conf (100%)
 rename conf/{ => nginx}/http-base.conf (100%)
 rename conf/{ => nginx}/nginx-nossl.conf (100%)
 rename conf/{ => nginx}/nginx.conf (100%)
 rename conf/{ => nginx}/rate-limiting.conf (100%)
 rename conf/{ => nginx}/root-base.conf (100%)
 rename conf/{ => nginx}/server-base.conf (100%)

diff --git a/conf/init/service/nginx/run b/conf/init/service/nginx/run
index aa5940682..0095f76d7 100755
--- 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'
diff --git a/conf/dhparams.pem b/conf/nginx/dhparams.pem
similarity index 100%
rename from conf/dhparams.pem
rename to conf/nginx/dhparams.pem
diff --git a/conf/hosted-http-base.conf b/conf/nginx/hosted-http-base.conf
similarity index 100%
rename from conf/hosted-http-base.conf
rename to conf/nginx/hosted-http-base.conf
diff --git a/conf/http-base.conf b/conf/nginx/http-base.conf
similarity index 100%
rename from conf/http-base.conf
rename to conf/nginx/http-base.conf
diff --git a/conf/nginx-nossl.conf b/conf/nginx/nginx-nossl.conf
similarity index 100%
rename from conf/nginx-nossl.conf
rename to conf/nginx/nginx-nossl.conf
diff --git a/conf/nginx.conf b/conf/nginx/nginx.conf
similarity index 100%
rename from conf/nginx.conf
rename to conf/nginx/nginx.conf
diff --git a/conf/rate-limiting.conf b/conf/nginx/rate-limiting.conf
similarity index 100%
rename from conf/rate-limiting.conf
rename to conf/nginx/rate-limiting.conf
diff --git a/conf/root-base.conf b/conf/nginx/root-base.conf
similarity index 100%
rename from conf/root-base.conf
rename to conf/nginx/root-base.conf
diff --git a/conf/server-base.conf b/conf/nginx/server-base.conf
similarity index 100%
rename from conf/server-base.conf
rename to conf/nginx/server-base.conf