diff --git a/.gitignore b/.gitignore index 88f7b29..f5777c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ group_vars/all/vault.yml host_vars/*.wirebrass.fr* -group_vars/munin_server.yml roles/geerlingguy.* inventory_wirebrass.yml .vault-password diff --git a/group_vars/all/all.yml b/group_vars/all/all.yml index 2f1b2f6..6b581b3 100644 --- a/group_vars/all/all.yml +++ b/group_vars/all/all.yml @@ -19,3 +19,6 @@ resolvers: # Domain to use in the DNS "search" resolver field main_domain: wirebrass.fr + +# Certbot admin Email address +certbot_admin_email: contact@wirebrass.fr diff --git a/group_vars/munin_server.yml.template b/group_vars/munin_server.yml similarity index 88% rename from group_vars/munin_server.yml.template rename to group_vars/munin_server.yml index c8a8cc2..8024947 100644 --- a/group_vars/munin_server.yml.template +++ b/group_vars/munin_server.yml @@ -1,11 +1,4 @@ --- -munin_hosts: - - name: "localhost" - address: "127.0.0.1" - extra: ["use_node_name yes"] - - name: "host.example.org" - address: "ssh://munin-async@host.example.org/ -W localhost:4949" - munin_admin_user: "{{ vault_munin_admin_user }}" munin_admin_password: "{{ vault_munin_admin_password }}" @@ -20,7 +13,6 @@ certbot_auto_renew_user: "root" certbot_auto_renew_hour: "3" certbot_auto_renew_minute: "30" certbot_auto_renew_options: "--quiet --no-self-upgrade" -certbot_admin_email: contact@wirebrass.fr certbot_create_if_missing: true certbot_create_method: standalone certbot_create_standalone_stop_services: @@ -54,8 +46,8 @@ nginx_vhosts: location /munin/ { auth_basic "Restricted"; auth_basic_user_file /etc/munin/munin-htpasswd; - + alias /var/cache/munin/www/; expires modified +310s; } - +