nginx: drop letsencrypt conf in favor of mozilla ssl
`certbox` argument parsing and plugin management isn't very suitable when it comes to automating nginx configuration through Debian packaging. It is not possible to instruct it to *only* generate letsencrypt ssl configuration for nginx which breaks the postinst script. Also missing fancyindex dependency was added.
This commit is contained in:
parent
e43be67041
commit
56a088c5db
2 changed files with 10 additions and 4 deletions
2
debian/control
vendored
2
debian/control
vendored
|
@ -27,7 +27,7 @@ Description: Shione nftables configuration.
|
||||||
Package: nginx-config
|
Package: nginx-config
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Multi-Arch: foreign
|
Multi-Arch: foreign
|
||||||
Depends: ${misc:Depends}, nginx, certbot, python3-certbot-nginx
|
Depends: ${misc:Depends}, nginx, certbot, libnginx-mod-http-fancyindex
|
||||||
Provides: ${diverted-files}
|
Provides: ${diverted-files}
|
||||||
Conflicts: ${diverted-files}
|
Conflicts: ${diverted-files}
|
||||||
Description: Shione nginx configuration.
|
Description: Shione nginx configuration.
|
||||||
|
|
|
@ -23,11 +23,18 @@ 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
|
# SSL configuration
|
||||||
#
|
#
|
||||||
# Partially generated by https://ssl-config.mozilla.org/.
|
# Partially generated by https://ssl-config.mozilla.org/.
|
||||||
listen 443 ssl default_server;
|
listen 443 ssl default_server;
|
||||||
listen [::]:443 ssl default_server;
|
listen [::]:443 ssl default_server;
|
||||||
|
|
||||||
#
|
#
|
||||||
# Note: You should disable gzip for SSL traffic.
|
# Note: You should disable gzip for SSL traffic.
|
||||||
# See: https://bugs.debian.org/773332
|
# See: https://bugs.debian.org/773332
|
||||||
|
@ -43,7 +50,6 @@ server {
|
||||||
ssl_certificate /etc/letsencrypt/live/shione.net/fullchain.pem;
|
ssl_certificate /etc/letsencrypt/live/shione.net/fullchain.pem;
|
||||||
# managed by Certbot.
|
# managed by Certbot.
|
||||||
ssl_certificate_key /etc/letsencrypt/live/shione.net/privkey.pem;
|
ssl_certificate_key /etc/letsencrypt/live/shione.net/privkey.pem;
|
||||||
include /etc/letsencrypt/options-ssl-nginx.conf;
|
|
||||||
|
|
||||||
# OCSP stapling
|
# OCSP stapling
|
||||||
ssl_stapling on;
|
ssl_stapling on;
|
||||||
|
|
Loading…
Reference in a new issue