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.j2certbot_on_virtu
commit
c042303665
|
@ -64,6 +64,9 @@
|
||||||
path: "{{ item }}"
|
path: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
loop:
|
loop:
|
||||||
|
- /etc/bcfg2.conf
|
||||||
|
- /etc/bcfg2.conf.ucf-dist
|
||||||
|
- /etc/crans
|
||||||
- /etc/cron.d/munin-crans
|
- /etc/cron.d/munin-crans
|
||||||
- /etc/cron.d/munin-node
|
- /etc/cron.d/munin-node
|
||||||
- /etc/cron.d/munin-node.dpkg-dist
|
- /etc/cron.d/munin-node.dpkg-dist
|
||||||
|
@ -76,8 +79,10 @@
|
||||||
- /etc/cron.d/autobcfg2
|
- /etc/cron.d/autobcfg2
|
||||||
- /etc/cron.d/bcfg2-run
|
- /etc/cron.d/bcfg2-run
|
||||||
- /etc/cron.d/pull-repos-scripts
|
- /etc/cron.d/pull-repos-scripts
|
||||||
|
- /etc/default/bcfg2
|
||||||
- /etc/munin
|
- /etc/munin
|
||||||
- /etc/icinga2
|
- /etc/icinga2
|
||||||
|
- /etc/init.d/bcfg2
|
||||||
- /etc/nut
|
- /etc/nut
|
||||||
- /etc/nginx/sites-enabled/status
|
- /etc/nginx/sites-enabled/status
|
||||||
- /etc/nginx/sites-available/status
|
- /etc/nginx/sites-available/status
|
||||||
|
|
|
@ -15,3 +15,5 @@ proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection $connection_upgrade;
|
proxy_set_header Connection $connection_upgrade;
|
||||||
|
|
||||||
|
# For Owncloud WebDav
|
||||||
|
client_max_body_size 10G;
|
||||||
|
|
Loading…
Reference in New Issue