From f0ced31efa202571fbecde85b0e52de9c3bee2d9 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Fri, 18 Aug 2017 15:18:06 +0200 Subject: [PATCH] review default vars --- apt/defaults/main.yml | 1 + munin/defaults/main.yml | 1 - munin/templates/munin.conf.j2 | 2 +- mysql/defaults/main.yml | 2 +- nagios-nrpe/defaults/main.yml | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apt/defaults/main.yml b/apt/defaults/main.yml index 671bc8b2..9e01a74e 100644 --- a/apt/defaults/main.yml +++ b/apt/defaults/main.yml @@ -1,3 +1,4 @@ +--- apt_install_basics: True apt_basics_components: "main" diff --git a/munin/defaults/main.yml b/munin/defaults/main.yml index 005a7989..ed97d539 100644 --- a/munin/defaults/main.yml +++ b/munin/defaults/main.yml @@ -1,2 +1 @@ --- -munin_dir: /home/www/munin diff --git a/munin/templates/munin.conf.j2 b/munin/templates/munin.conf.j2 index 6c837aa3..27e9c97e 100644 --- a/munin/templates/munin.conf.j2 +++ b/munin/templates/munin.conf.j2 @@ -6,7 +6,7 @@ # defaulted to the values you see here. # #dbdir /var/db/munin -htmldir {{ munin_dir }} +#htmldir /var/cache/munin/www #logdir /var/log/munin #rundir /var/run/munin diff --git a/mysql/defaults/main.yml b/mysql/defaults/main.yml index b84e59ec..d56e5999 100644 --- a/mysql/defaults/main.yml +++ b/mysql/defaults/main.yml @@ -2,7 +2,7 @@ general_alert_email: "root@localhost" log2mail_alert_email: Null -general_scripts_dir: "/usr/local/bin" +general_scripts_dir: "/usr/share/scripts" mysql_scripts_dir: Null mysql_variant: oracle diff --git a/nagios-nrpe/defaults/main.yml b/nagios-nrpe/defaults/main.yml index f1a4731b..c9ee2603 100644 --- a/nagios-nrpe/defaults/main.yml +++ b/nagios-nrpe/defaults/main.yml @@ -5,6 +5,6 @@ nagios_nrpe_ldap_passwd: LDAP_PASSWD nagios_nrpe_pgsql_passwd: PGSQL_PASSWD nagios_nrpe_amavis_from: "foobar@{{ ansible_domain }}" -nagios_nrpe_check_proxy_host: "www.debian.org" +nagios_nrpe_check_proxy_host: "www.example.com" nagios_plugins_directory: "/usr/local/lib/nagios/plugins"