re-enable http -> https 301, comment matrix

diff --git a/etc/nginx/sites-available/default b/etc/nginx/sites-available/default
index af45d1f256951a218af25ffcb1b3f105b64f57bd..3c6c5413c403694fd111acf35756be621f9355f1 100644 (file)
--- a/etc/nginx/sites-available/default
+++ b/etc/nginx/sites-available/default
@@ -6,8 +6,8 @@ upstream dev.nutra.tk {
 
 server {
   server_name dev.nutra.tk;
-  listen 80 default_server;
-  listen [::]:80 ipv6only=on;
+  # listen 80 default_server;
+  # listen [::]:80 ipv6only=on;
   listen 443 ssl http2 default_server;
   listen [::]:443 ssl ipv6only=on; # managed by Certbot
 
@@ -70,31 +70,31 @@ server {
 
 
 # Open matrix chat on 8448
-server {
-  listen 8448 ssl default_server;
-  listen [::]:8448 ssl default_server;
-  server_name dev.nutra.tk;
-
-  location / {
-    proxy_pass http://127.0.0.1:8008;
-    proxy_set_header X-Forwarded-For $remote_addr;
-  }
-
-  # HTTPS / SSL
-  ssl_certificate /etc/letsencrypt/live/dev.nutra.tk/fullchain.pem; # managed by Certbot
-  ssl_certificate_key /etc/letsencrypt/live/dev.nutra.tk/privkey.pem; # managed by Certbot
-  include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-  ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-}
+#server {
+#  listen 8448 ssl default_server;
+#  listen [::]:8448 ssl default_server;
+#  server_name dev.nutra.tk;
+#
+#  location / {
+#    proxy_pass http://127.0.0.1:8008;
+#    proxy_set_header X-Forwarded-For $remote_addr;
+#  }
+#
+#  # HTTPS / SSL
+#  ssl_certificate /etc/letsencrypt/live/dev.nutra.tk/fullchain.pem; # managed by Certbot
+#  ssl_certificate_key /etc/letsencrypt/live/dev.nutra.tk/privkey.pem; # managed by Certbot
+#  include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+#  ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+#}
 
 
 # Redirect all HTTP to HTTPS with no-WWW
-#server {
-#  listen 80 default_server;
-#  listen [::]:80 default_server;
-#  server_name ~^(?:www\.)?(.*)$;
-#  return 301 http://$1$request_uri;
-#}
+server {
+  listen 80 default_server;
+  listen [::]:80 default_server;
+  server_name ~^(?:www\.)?(.*)$;
+  return 301 https://$1$request_uri;
+}
 
 
 # Redirect WWW to no-WWW