Change Munin server config and set vars in host_vars instead of group_vars

This commit is contained in:
Nemo 2020-07-11 09:38:12 +02:00
parent f2f2b5440a
commit 16eae4c919
3 changed files with 5 additions and 11 deletions

1
.gitignore vendored
View file

@ -1,6 +1,5 @@
group_vars/all/vault.yml group_vars/all/vault.yml
host_vars/*.wirebrass.fr* host_vars/*.wirebrass.fr*
group_vars/munin_server.yml
roles/geerlingguy.* roles/geerlingguy.*
inventory_wirebrass.yml inventory_wirebrass.yml
.vault-password .vault-password

View file

@ -19,3 +19,6 @@ resolvers:
# Domain to use in the DNS "search" resolver field # Domain to use in the DNS "search" resolver field
main_domain: wirebrass.fr main_domain: wirebrass.fr
# Certbot admin Email address
certbot_admin_email: contact@wirebrass.fr

View file

@ -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_user: "{{ vault_munin_admin_user }}"
munin_admin_password: "{{ vault_munin_admin_password }}" munin_admin_password: "{{ vault_munin_admin_password }}"
@ -20,7 +13,6 @@ certbot_auto_renew_user: "root"
certbot_auto_renew_hour: "3" certbot_auto_renew_hour: "3"
certbot_auto_renew_minute: "30" certbot_auto_renew_minute: "30"
certbot_auto_renew_options: "--quiet --no-self-upgrade" certbot_auto_renew_options: "--quiet --no-self-upgrade"
certbot_admin_email: contact@wirebrass.fr
certbot_create_if_missing: true certbot_create_if_missing: true
certbot_create_method: standalone certbot_create_method: standalone
certbot_create_standalone_stop_services: certbot_create_standalone_stop_services:
@ -54,8 +46,8 @@ nginx_vhosts:
location /munin/ { location /munin/ {
auth_basic "Restricted"; auth_basic "Restricted";
auth_basic_user_file /etc/munin/munin-htpasswd; auth_basic_user_file /etc/munin/munin-htpasswd;
alias /var/cache/munin/www/; alias /var/cache/munin/www/;
expires modified +310s; expires modified +310s;
} }