diff --git a/files/add-headers.conf b/files/add-headers.conf index 2c5c6af..fb3ed44 100644 --- a/files/add-headers.conf +++ b/files/add-headers.conf @@ -1 +1,3 @@ +# Ansible managed + Header always set Strict-Transport-Security "max-age=63072000" diff --git a/files/letsencrypt.conf b/files/letsencrypt.conf index a99dbdc..fa58635 100644 --- a/files/letsencrypt.conf +++ b/files/letsencrypt.conf @@ -1,3 +1,5 @@ +# Ansible managed + Alias /.well-known/acme-challenge/ "/var/lib/dehydrated/acme-challenges/" diff --git a/files/sao-cache.conf b/files/sao-cache.conf index 971af04..3152dae 100644 --- a/files/sao-cache.conf +++ b/files/sao-cache.conf @@ -1,4 +1,4 @@ -# Verwaltet durch Ansible (Rolle "apache2") +# Ansible managed ExpiresActive on diff --git a/files/server-status.conf b/files/server-status.conf index 5ee5b34..e392d6c 100644 --- a/files/server-status.conf +++ b/files/server-status.conf @@ -1,3 +1,5 @@ +# Ansible managed + ServerName localhost diff --git a/templates/munin.j2 b/templates/munin_configuration similarity index 51% rename from templates/munin.j2 rename to templates/munin_configuration index 4054611..a3a79cf 100644 --- a/templates/munin.j2 +++ b/templates/munin_configuration @@ -1,6 +1,5 @@ +# Ansible managed + [apache*] env.url http://localhost/server-status?auto -{% if inventory_hostname == "orwell" %} -env.ports 443 -{% endif %} env.showfree 1 diff --git a/templates/remoteip.conf b/templates/remoteip.conf index 22892df..890e75f 100644 --- a/templates/remoteip.conf +++ b/templates/remoteip.conf @@ -1,3 +1,5 @@ +# Ansible managed + RemoteIPHeader X-Forwarded-For RemoteIPTrustedProxy {{ gateway_host_ip }} diff --git a/templates/ssl.conf b/templates/ssl.conf index 2bc5412..f583924 100644 --- a/templates/ssl.conf +++ b/templates/ssl.conf @@ -1,3 +1,5 @@ +# Ansible managed + SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1 SSLCipherSuite ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256 SSLHonorCipherOrder off