diff options
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | files/etc/nginx/sites-available/shione.net | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/debian/control b/debian/control index 3ff7ddf..4ce00f9 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Description: Shione nftables configuration. Package: nginx-config Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, nginx, certbot, python3-certbot-nginx +Depends: ${misc:Depends}, nginx, certbot, libnginx-mod-http-fancyindex Provides: ${diverted-files} Conflicts: ${diverted-files} Description: Shione nginx configuration. diff --git a/files/etc/nginx/sites-available/shione.net b/files/etc/nginx/sites-available/shione.net index 28f7afe..078927b 100644 --- a/files/etc/nginx/sites-available/shione.net +++ b/files/etc/nginx/sites-available/shione.net @@ -20,14 +20,21 @@ # # `fancyindex` is from `nginx-extras`. server { - listen 80 default_server; - listen [::]:80 default_server; + listen 80 default_server; + listen [::]:80 default_server; + location / { + return 301 https://$host$request_uri; + } +} + +server { # SSL configuration # # Partially generated by https://ssl-config.mozilla.org/. listen 443 ssl default_server; listen [::]:443 ssl default_server; + # # Note: You should disable gzip for SSL traffic. # See: https://bugs.debian.org/773332 @@ -43,7 +50,6 @@ server { ssl_certificate /etc/letsencrypt/live/shione.net/fullchain.pem; # managed by Certbot. ssl_certificate_key /etc/letsencrypt/live/shione.net/privkey.pem; - include /etc/letsencrypt/options-ssl-nginx.conf; # OCSP stapling ssl_stapling on; |