just always redirect http -> https

2 files changed, 4 insertions, 20 deletions

diff --git a/modules/tozt/files/nginx/doy.conf b/modules/tozt/files/nginx/doy.conf
index 19eaade..15c3932 100644
--- a/modules/tozt/files/nginx/doy.conf
+++ b/modules/tozt/files/nginx/doy.conf
@@ -2,19 +2,9 @@ server {
     listen       80 default;
     server_name  tozt.net;
 
-    access_log  /var/log/nginx/doy.access.log;
-    error_log   /var/log/nginx/doy.error.log;
+    access_log   /var/log/nginx/doy.access.log;
+    error_log    /var/log/nginx/doy.error.log;
 
-    location / {
-        root   /home/doy;
-        try_files /site$uri /site$uri/index.html /public_html$uri =404;
-    }
-
-    location /recipes/ {
-        root          /home/doy/public_html;
-        index         index.html index.htm;
-        default_type  text/plain;
-        autoindex     on;
-    }
+    rewrite      ^(.*) https://$host$1 permanent;
 }
 # vim:ft=nginx
diff --git a/modules/tozt/files/nginx/paste.conf b/modules/tozt/files/nginx/paste.conf
index 7305455..839fe78 100644
--- a/modules/tozt/files/nginx/paste.conf
+++ b/modules/tozt/files/nginx/paste.conf
@@ -5,12 +5,6 @@ server {
     access_log   /var/log/nginx/paste.access.log;
     error_log    /var/log/nginx/paste.error.log;
 
-    include      /etc/nginx/mime.types.paste;
-
-    root         /home/doy/paste;
-    default_type text/plain;
-    gzip_types   text/plain;
-
-    location / { }
+    rewrite      ^(.*) https://$host$1 permanent;
 }
 # vim:ft=nginx