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
@@ -1,29 +1,29 @@
 #
 # Default  Bacula File Daemon Configuration file
 #
 #  For Bacula release 5.2.6 (21 February 2012) -- debian jessie/sid
 
 #
 # 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"
 }
 
 # Send all messages except skipped files back to Director
 Messages {
   Name = Standard
   director = {{ hostvars[dir].inventory_hostname_short }}-dir = all, !skipped, !restored
 }
 {% endfor %}
 
 #
 # "Global" File daemon configuration specifications
 #
 FileDaemon {  # define myself
   Name = {{ inventory_hostname_short }}-fd
   Working Directory = /var/lib/bacula
   Pid Directory = /var/run/bacula
   Maximum Concurrent Jobs = 20
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
@@ -24,29 +24,29 @@ group root
 
 # Regexps for files to ignore
 ignore_file [\#~]$
 ignore_file DEADJOE$
 ignore_file \.bak$
 ignore_file %$
 ignore_file \.dpkg-(tmp|new|old|dist)$
 ignore_file \.rpm(save|new)$
 ignore_file \.pod$
 
 # Set this if the client doesn't report the correct hostname when
 # telnetting to {{ ipsec[inventory_hostname_short] }}, port 4949
 #
 host_name {{ inventory_hostname_short }}
 
 # A list of addresses that are allowed to connect.  This must be a
 # regular expression, since Net::Server does not understand CIDR-style
 # 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 %}
 
 # Which address to bind to;
 host {{ ipsec[inventory_hostname_short] }}
 
 # And which port
 port 4994
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
@@ -1,48 +1,48 @@
 # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
 
 driftfile /var/lib/ntp/ntp.drift
 
 
 # Enable this if you want statistics to be logged.
 #statsdir /var/log/ntpstats/
 
 statistics loopstats peerstats clockstats
 filegen loopstats file loopstats type day enable
 filegen peerstats file peerstats type day enable
 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
 server sth2.ntp.se iburst
 server gbg1.ntp.se iburst
 server gbg2.ntp.se iburst
 server ntp1.sp.se  iburst
 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
 pool 1.{{ geoip | default('debian') }}.pool.ntp.org iburst
 pool 2.{{ geoip | default('debian') }}.pool.ntp.org iburst
 pool 3.{{ geoip | default('debian') }}.pool.ntp.org iburst
 {% endif %}
 
 
 # Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
 # details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
 # might also be helpful.
 #
 # Note that "restrict" applies to both servers and clients, so a configuration
 # that might be intended to block requests from certain clients could also end
 # up blocking replies from your own upstream servers.
 
 # By default, exchange time with everybody, but don't allow configuration.
 restrict -4 default kod notrap nomodify nopeer noquery limited
 restrict -6 default kod notrap nomodify nopeer noquery limited