change to not depend on https by default

2 files changed, 41 insertions, 22 deletions

diff --git a/nginx/certs_default.conf b/nginx/certs_default.conf
new file mode 100755
index 0000000..1904b28
--- /dev/null
+++ b/nginx/certs_default.conf
@@ -0,0 +1,40 @@
+upstream php {
+    server php:9000;
+}
+
+server {
+    listen 80;
+    server_name 100.75.105.112;
+    root /var/www/html;
+    index index.php index.html;
+
+    location / {
+        try_files $uri $uri/ /index.php?$args;
+    }
+
+    location ~ \.php$ {
+        include fastcgi.conf;
+        fastcgi_intercept_errors on;
+        fastcgi_pass php;
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name ${NGINX_SERVER_NAME};
+    root /var/www/html;
+    index index.php index.html;
+
+    location / {
+        try_files $uri $uri/ /index.php?$args;
+    }
+
+    location ~ \.php$ {
+        include fastcgi.conf;
+        fastcgi_intercept_errors on;
+        fastcgi_pass php;
+    }
+
+	ssl_certificate /etc/nginx/certs/self-signed/cert.pem;
+	ssl_certificate_key /etc/nginx/certs/self-signed/cert-key.pem;
+}
diff --git a/nginx/default.conf b/nginx/default.conf
index dd7534a..92ad67d 100755
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -1,5 +1,4 @@
 upstream php {
-    # Remove the unix socket line - it won't work between containers
     server php:9000;
 }
 
@@ -7,7 +6,7 @@ server {
     listen 80;
     server_name 100.75.105.112;
     root /var/www/html;
-    index index.php index.html;  # Add this line
+    index index.php index.html;
 
     location / {
         try_files $uri $uri/ /index.php?$args;
@@ -19,23 +18,3 @@ server {
         fastcgi_pass php;
     }
 }
-
-server {
-    listen 443 ssl;
-    server_name ${NGINX_SERVER_NAME};
-    root /var/www/html;
-    index index.php index.html;  # Add this line
-
-    location / {
-        try_files $uri $uri/ /index.php?$args;
-    }
-
-    location ~ \.php$ {
-        include fastcgi.conf;
-        fastcgi_intercept_errors on;
-        fastcgi_pass php;
-    }
-
-	ssl_certificate /etc/nginx/certs/self-signed/cert.pem;
-	ssl_certificate_key /etc/nginx/certs/self-signed/cert-key.pem;
-}