template breakage

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 21a194e..430a4bf 100644 (file)
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -8,7 +8,7 @@
 ## buildd.debian.org: grieg.debian.org::587 byname
 
 <%=
-mxmatches = [ scope.lookupvar('::fqdn') ]
+mxmatches = [ @fqdn ]
 routes = []
 extraroutes = []
 

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index aafed39..67e3457 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -21,17 +21,15 @@
 
 <%
   rolehost={}
-  localinfo = scope.lookupvar('site::localinfo')
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
+  roles = scope.lookupvar('site::roles')
 
   %w{mailrelay nagiosmaster extranrpeclient muninmaster dbmaster static_mirror static_source static_master}.each do |role|
     rolehost[role] = []
-    localinfo.keys.sort.each do |node|
-      if localinfo[node][role]
+    roles[role].each do |node|
         rolehost[role] << allnodeinfo[node]['ipHostNumber']
-      end
     end
-    rolehost[role].flatten!
+    rolehost[role].flatten!.sort.uniq
   end
 
   dbs = []

diff --git a/modules/munin/templates/munin-node.conf.erb b/modules/munin/templates/munin-node.conf.erb
index d2d00b8..7a316a1 100644 (file)
--- a/modules/munin/templates/munin-node.conf.erb
+++ b/modules/munin/templates/munin-node.conf.erb
@@ -41,12 +41,11 @@ ignore_file \.rpm(save|new)$
 allow ^127\.0\.0\.1$
 <%=
 str = ''
-scope.lookupvar('site::localinfo').keys.sort.each do |node|
-   if scope.lookupvar('site::localinfo')[node]['muninmaster']
+roles = scope.lookupvar('site::roles')
+roles['muninmaster'].each do |node|
       scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
          str += "allow ^" + ip.split('.').join('\.') + "$\n"
       end
-   end
 end
 str
 -%>

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 325b7f1..9ec33e8 100644 (file)
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -5,13 +5,12 @@
 
 acl Nagios {
 <%=
+  roles = scope.lookupvar('site::roles')
   str = ''
-  scope.lookupvar('site::localinfo').keys.sort.each do |node|
-      if scope.lookupvar('site::localinfo')[node]['nagiosmaster']
+  roles['nagiosmaster'].each do |node|
           scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
               str += "\t" + ip + "/32;\n"
           end
-      end
   end
   str-%>
 };

diff --git a/modules/roles/templates/static-mirroring/static-clients.conf.erb b/modules/roles/templates/static-mirroring/static-clients.conf.erb
index edbf313..8e2b872 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-clients.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-clients.conf.erb
@@ -4,15 +4,8 @@
 
 <%=
 
-mirrors = []
-scope.lookupvar('site::localinfo').keys.sort.each do |node|
-    if scope.lookupvar('site::localinfo')[node]['static_mirror']
-        mirrors << node
-    end
-end
+scope.lookupvar('site::roles')['static_mirror'].join("\n")
 
-
-mirrors.join("\n")
 # vim:set et:
 # vim:set sts=4 ts=4:
 # vim:set shiftwidth=4:

diff --git a/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb b/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
index 03e91b0..eecf4c6 100644 (file)
--- a/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
+++ b/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
@@ -13,12 +13,13 @@ def getstaticsynckey(host)
     return key
 end
 
-localinfo = scope.lookupvar('site::localinfo')
 allnodeinfo = scope.lookupvar('site::allnodeinfo')
+roles = scope.lookupvar('site::roles')
 
 callers = []
-localinfo.keys.sort.each do |node|
-    if localinfo[node]['static_mirror'] or localinfo[node]['static_source'] or localinfo[node]['static_master']
+
+%w{static_mirror static_source static_master}.each do |role|
+    roles[role].each do |node|
         key = getstaticsynckey(node)
         callers << { 'node' => node, 'addr' => allnodeinfo[node]['ipHostNumber'], 'key' => key}
     end

diff --git a/modules/roles/templates/weblog_destination-authorized_keys.erb b/modules/roles/templates/weblog_destination-authorized_keys.erb
index fc21537..60867e5 100644 (file)
--- a/modules/roles/templates/weblog_destination-authorized_keys.erb
+++ b/modules/roles/templates/weblog_destination-authorized_keys.erb
@@ -13,15 +13,13 @@ def getweblogsynckey(host)
     return key
 end
 
-localinfo = scope.lookupvar('site::localinfo')
 allnodeinfo = scope.lookupvar('site::allnodeinfo')
+roles = scope.lookupvar('site::roles')
 
 mirrors = []
-localinfo.keys.sort.each do |node|
-    if localinfo[node]['weblog_provider']
+roles['weblog_provider'].each do |node|
         key = getweblogsynckey(node)
         mirrors << { 'node' => node, 'addr' => allnodeinfo[node]['ipHostNumber'], 'key' => key}
-    end
 end
 
 lines = []