From d8b40cd112bfcbeb55b57f55e26f83f9a0398113 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 21 Feb 2010 03:37:15 +0000 Subject: [PATCH] automate named.conf.acl Signed-off-by: Stephen Gran --- modules/named/manifests/geodns.pp | 3 +-- .../named.conf.acl => templates/named.conf.acl.erb} | 13 +++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) rename modules/named/{files/common/named.conf.acl => templates/named.conf.acl.erb} (95%) diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp index 182b80b0..851b474d 100644 --- a/modules/named/manifests/geodns.pp +++ b/modules/named/manifests/geodns.pp @@ -17,8 +17,7 @@ class named::geodns inherits named { group => root, ; "/etc/bind/named.conf.acl": - source => [ "puppet:///named/per-host/$fqdn/named.conf.acl", - "puppet:///named/common/named.conf.acl" ], + content => template("named/named.conf.acl"), require => Package["bind9"], notify => Exec["bind9 restart"], owner => root, diff --git a/modules/named/files/common/named.conf.acl b/modules/named/templates/named.conf.acl.erb similarity index 95% rename from modules/named/files/common/named.conf.acl rename to modules/named/templates/named.conf.acl.erb index 2a957539..3ce48250 100644 --- a/modules/named/files/common/named.conf.acl +++ b/modules/named/templates/named.conf.acl.erb @@ -4,8 +4,17 @@ // acl Nagios { - 192.25.206.33/32; - 206.12.19.118/32; + <%= + nagii = [] + localinfo.keys.sort.each do |node| + if localinfo[node]['nagiosmaster'] + nagii << keyinfo[node][0]['ipHostNumber'] + '/32' + end + end + + nagii.join(";\n\t") +%>; + }; // Africa -- 2.39.2