summaryrefslogtreecommitdiffstats
path: root/roles/common
diff options
context:
space:
mode:
Diffstat (limited to 'roles/common')
-rw-r--r--roles/common/templates/etc/bacula/bacula-fd.conf.j22
-rw-r--r--roles/common/templates/etc/munin/munin-node.conf.j22
-rw-r--r--roles/common/templates/etc/ntp.conf.j24
3 files changed, 4 insertions, 4 deletions
diff --git a/roles/common/templates/etc/bacula/bacula-fd.conf.j2 b/roles/common/templates/etc/bacula/bacula-fd.conf.j2
index d64ac86..e06911f 100644
--- a/roles/common/templates/etc/bacula/bacula-fd.conf.j2
+++ b/roles/common/templates/etc/bacula/bacula-fd.conf.j2
@@ -6,7 +6,7 @@
#
# List Directors who are permitted to contact this File daemon
#
-{% for dir in groups['bacula-dir'] | sort %}
+{% for dir in groups['bacula_dir'] | sort %}
Director {
Name = {{ hostvars[dir].inventory_hostname_short }}-dir
@|"sed -n '/^{{ hostvars[dir].inventory_hostname_short }}-dir\\s/ {s//Password = /p; q}' /etc/bacula/passwords-fd"
diff --git a/roles/common/templates/etc/munin/munin-node.conf.j2 b/roles/common/templates/etc/munin/munin-node.conf.j2
index d0004b7..1563526 100644
--- a/roles/common/templates/etc/munin/munin-node.conf.j2
+++ b/roles/common/templates/etc/munin/munin-node.conf.j2
@@ -41,7 +41,7 @@ host_name {{ inventory_hostname_short }}
# network notation unless the perl module Net::CIDR is installed. You
# may repeat the allow line as many times as you'd like
-{% for host in groups['munin-master'] %}
+{% for host in groups['munin_master'] %}
allow ^{{ ipsec[ hostvars[host].inventory_hostname_short ] | ipv4 | replace(".","\.") }}$
{% endfor %}
diff --git a/roles/common/templates/etc/ntp.conf.j2 b/roles/common/templates/etc/ntp.conf.j2
index 7bd1c4a..18c03cf 100644
--- a/roles/common/templates/etc/ntp.conf.j2
+++ b/roles/common/templates/etc/ntp.conf.j2
@@ -13,7 +13,7 @@ filegen clockstats file clockstats type day enable
# You do need to talk to an NTP server or two (or three).
-{% if 'NTP-master' in group_names %}
+{% if 'NTP_master' in group_names %}
# Use Stratum One Time Servers:
# http://support.ntp.org/bin/view/Servers/StratumOneTimeServers
server sth1.ntp.se iburst
@@ -25,7 +25,7 @@ server ntp2.sp.se iburst
{% else %}
# Sychronize to our (stratum 2) NTP server, to ensure our network has a
# consistent time.
-{% for host in groups['NTP-master'] | sort %}
+{% for host in groups['NTP_master'] | sort %}
server {{ ipsec[ hostvars[host].inventory_hostname_short ] }} prefer iburst
{% endfor %}
pool 0.{{ geoip | default('debian') }}.pool.ntp.org iburst