Merge branch 'master' into 'cache_lookup_api'

# Conflicts:
#   roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy.j2
#   roles/nginx-reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2
#   roles/nginx-reverseproxy/templates/nginx/snippets/options-ssl.conf.j2
certbot_on_virtu
_pollion 2020-05-08 11:33:08 +02:00
commit c042303665
4 changed files with 9 additions and 2 deletions

View File

@ -64,6 +64,9 @@
path: "{{ item }}"
state: absent
loop:
- /etc/bcfg2.conf
- /etc/bcfg2.conf.ucf-dist
- /etc/crans
- /etc/cron.d/munin-crans
- /etc/cron.d/munin-node
- /etc/cron.d/munin-node.dpkg-dist
@ -76,8 +79,10 @@
- /etc/cron.d/autobcfg2
- /etc/cron.d/bcfg2-run
- /etc/cron.d/pull-repos-scripts
- /etc/default/bcfg2
- /etc/munin
- /etc/icinga2
- /etc/init.d/bcfg2
- /etc/nut
- /etc/nginx/sites-enabled/status
- /etc/nginx/sites-available/status

View File

@ -36,7 +36,7 @@ server {
# Keep the TCP connection open a bit for faster browsing
keepalive_timeout 70;
# Custom error page
error_page 500 502 503 504 /50x.html;
location = /50x.html {

View File

@ -15,3 +15,5 @@ proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
# For Owncloud WebDav
client_max_body_size 10G;

View File

@ -3,7 +3,7 @@
ssl_certificate {{ nginx.ssl.cert }};
ssl_certificate_key {{ nginx.ssl.cert_key }};
ssl_session_timeout 1d;
ssl_session_cache shared:MozSSL:10m;
ssl_session_cache shared:MozSSL:10m;
ssl_session_tickets off;
ssl_dhparam /etc/letsencrypt/dhparam;
ssl_protocols TLSv1.2 TLSv1.3;