fix conf files for nginx

conf.d/charlesreid1.blue.http

@@ -1,58 +0,0 @@
-####################
-#
-# charlesreid1.blue
-# http
-# 80
-# 
-# basically, just redirects to https
-#
-####################
-
-server {
-
-    user www-data:www-data;
-
-    # http://charlesreid1.blue --> https://charlesreid1.blue
-
-    listen 80;
-    listen [::]:80;
-
-    server_name charlesreid1.blue;
-
-    location / {
-        return 301 https://$server_name$request_uri;
-    }
-
-}
-
-server {
-
-    user www-data:www-data;
-
-    # http://www.charlesreid1.blue --> https://charlesreid1.blue
-
-    listen 80;
-    listen [::]:80;
-
-    server_name www.charlesreid1.blue;
-
-    location / {
-        return 301 https://charlesreid1.blue$request_uri;
-    }
-}
-
-server {
-
-    user www-data:www-data;
-
-    # http://git.charlesreid1.blue --> https://git.charlesreid1.blue
-
-    listen 80;
-
-    server_name git.charlesreid1.blue;
-
-    location / {
-        return 301 https://git.charlesreid1.blue$request_uri;
-    }
-}
-

conf.d/charlesreid1.blue.http.conf

@@ -0,0 +1,25 @@
+####################
+#
+# charlesreid1.blue
+# http
+# 80
+# 
+# basically, just redirects to https
+#
+####################
+
+server {
+    # http://charlesreid1.blue --> https://charlesreid1.blue
+    listen 80;
+    listen [::]:80;
+    server_name charlesreid1.blue;
+    #location / {
+    #    return 301 https://$server_name$request_uri;
+    #}
+    location / {
+        try_files $uri $uri/ =404;
+        root /usr/share/nginx/html;
+        index index.html;
+    }
+}
+

conf.d/charlesreid1.blue.https

@@ -1,49 +0,0 @@
-####################
-#
-# charlesreid1.blue
-# https
-# 443
-# 
-####################
-
-server {
-
-    user www-data:www-data;
-
-    # https://charlesreid1.blue
-
-    listen 443;
-    listen [::]:443;
-
-    ssl on;
-    ssl_certificate /etc/letsencrypt/live/charlesreid1.blue/fullchain.pem
-    ssl_certificate_key /etc/letsencrypt/live/charlesreid1.blue/privkey.pem
-    include /etc/letsencrypt/options-ssl-nginx.conf
-
-    root /www/charlesreid1.blue/htdocs;
-    index index.html;
-
-    server_name charlesreid1.blue;
-
-    client_max_body_size 100m;
-
-    location / {
-        try_files $uri $uri/ =404;
-    }
-
-    location /wiki/ {
-        proxy_set_header X-Real-IP  $remote_addr;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_set_header Host $host;
-        proxy_pass http://stormy_mw:8989/wiki/;
-    }
-
-    location /w/ {
-        proxy_set_header X-Real-IP  $remote_addr;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_set_header Host $host;
-        proxy_pass http://stormy_mw:8989/w/;
-    }
-
-}
-

conf.d/charlesreid1.blue.https.conf

@@ -0,0 +1,47 @@
+####################
+#
+# charlesreid1.blue
+# https
+# 443
+# 
+####################
+
+server {
+
+    # https://charlesreid1.blue
+
+    listen 443;
+    listen [::]:443;
+
+    ssl on;
+    ssl_certificate /etc/letsencrypt/live/charlesreid1.blue/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/charlesreid1.blue/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+
+    root /www/charlesreid1.blue/htdocs;
+    index index.html;
+
+    server_name charlesreid1.blue;
+
+    client_max_body_size 100m;
+
+    location / {
+        try_files $uri $uri/ =404;
+    }
+
+    #location /wiki/ {
+    #    proxy_set_header X-Real-IP  $remote_addr;
+    #    proxy_set_header X-Forwarded-For $remote_addr;
+    #    proxy_set_header Host $host;
+    #    proxy_pass http://stormy_mw:8989/wiki/;
+    #}
+
+    #location /w/ {
+    #    proxy_set_header X-Real-IP  $remote_addr;
+    #    proxy_set_header X-Forwarded-For $remote_addr;
+    #    proxy_set_header Host $host;
+    #    proxy_pass http://stormy_mw:8989/w/;
+    #}
+
+}
+