diff --git a/docker-fogcutter/nginx/launch.sh b/docker-fogcutter/nginx/launch.sh index a71bd27..3c4e4fb 100755 --- a/docker-fogcutter/nginx/launch.sh +++ b/docker-fogcutter/nginx/launch.sh @@ -10,12 +10,11 @@ docker run \ --env PGID=1000 \ --env EMAIL=sysadmin@seaturtle.pw \ --env URL=seaturtle.pw \ - --env SUBDOMAINS=airsonic,manx,plex,syncthing,www \ + --env SUBDOMAINS=airsonic,plex,syncthing,www \ --env VALIDATION=html \ --env TZ=US/Eastern \ --volume $PWD/config:/config:rw \ --volume $PWD/nginx.conf:/config/nginx/nginx.conf:ro \ - --volume $PWD/ssl.conf:/config/nginx/ssl.conf:ro \ --volume $PWD/site-confs:/config/nginx/site-confs:ro \ --volume $PWD/jail.local:/config/jail2ban/jail.local:ro \ --publish 10.42.0.203:80:80 \ diff --git a/docker-fogcutter/nginx/nginx.conf b/docker-fogcutter/nginx/nginx.conf index e25439c..4c3f0ca 100644 --- a/docker-fogcutter/nginx/nginx.conf +++ b/docker-fogcutter/nginx/nginx.conf @@ -1,4 +1,4 @@ -## Version 2018/01/29 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/nginx.conf +## Version 2018/04/07 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/nginx.conf user abc; worker_processes 4; @@ -59,3 +59,5 @@ http { include /config/nginx/site-confs/default; include /config/nginx/site-confs/*.enabled; } + +daemon off; diff --git a/docker-fogcutter/nginx/site-confs/seaturtle.pw.enabled b/docker-fogcutter/nginx/site-confs/seaturtle.pw.enabled index e1f7388..3098aa6 100644 --- a/docker-fogcutter/nginx/site-confs/seaturtle.pw.enabled +++ b/docker-fogcutter/nginx/site-confs/seaturtle.pw.enabled @@ -32,4 +32,3 @@ server { proxy_pass https://paulwalko.github.io; } } - diff --git a/docker-fogcutter/nginx/ssl.conf b/docker-fogcutter/nginx/ssl.conf deleted file mode 100644 index d2c6d9e..0000000 --- a/docker-fogcutter/nginx/ssl.conf +++ /dev/null @@ -1,36 +0,0 @@ -## Version 2018/05/31 - Changelog: https://github.com/linuxserver/docker-letsencrypt/commits/master/root/defaults/ssl.conf - -# session settings -ssl_session_timeout 1d; -ssl_session_cache shared:SSL:50m; -ssl_session_tickets off; - -# Diffie-Hellman parameter for DHE cipher suites -ssl_dhparam /config/nginx/dhparams.pem; - -# ssl certs -#ssl_certificate /config/keys/letsencrypt/fullchain.pem; -#ssl_certificate_key /config/keys/letsencrypt/privkey.pem; -ssl_certificate /etc/letsencrypt/live/vtluug.org/fullchain.pem; -ssl_certificate_key /etc/letsencrypt/live/vtluug.org/privkey.pem; - -# protocols -ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; -ssl_prefer_server_ciphers on; -ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA; - -# HSTS, remove # from the line below to enable HSTS -#add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always; - -# OCSP Stapling -ssl_stapling on; -ssl_stapling_verify on; - -# Optional additional headers -#add_header Content-Security-Policy "upgrade-insecure-requests"; -#add_header X-Frame-Options "SAMEORIGIN" always; -#add_header X-XSS-Protection "1; mode=block" always; -#add_header X-Content-Type-Options "nosniff" always; -#add_header X-UA-Compatible "IE=Edge" always; -#add_header Cache-Control "no-transform" always; -#add_header Referrer-Policy "same-origin" always;