Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  but fano, surprisingly, has a different IP than finzi
  dijkstra also relays for fano
  still picky erb
  picky picky erb
  silly typo
  inc-debian.org now a template
  Remove samosa from nrpe allowed hosts, add draghi
  looks like I broke this when switching to named variables

diff --git a/modules/exim/files/per-host/dijkstra.debian.org/manualroute b/modules/exim/files/per-host/dijkstra.debian.org/manualroute
index 6903bcb3d590641205c7b4ec27ab6b89afaa4dbc..25d052ef99b528ae8a8dad49d539af0f8659ae6f 100644 (file)
--- a/modules/exim/files/per-host/dijkstra.debian.org/manualroute
+++ b/modules/exim/files/per-host/dijkstra.debian.org/manualroute
@@ -8,3 +8,4 @@
 ## buildd.debian.org: raff.debian.org::587 byname
 
 finzi.debian.org:          [172.17.12.2]::25
+fano.debian.org:          [172.17.12.3]::25

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 562caffda8ac1d6adbb99e9db4da9cebeb50bb43..0bfe9bdc83bb18697355ff5377572899ae41c2cd 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -918,7 +918,7 @@ out
 %>
 
 acl_check_predata:
-  deny   condition     = ${if eq{$acl_m_lcl}{localonly}}
+  deny   condition     = ${if eq{$acl_m_prf}{localonly}}
          message       = mail for $acl_m_lrc is only accepted internally
 
   accept

diff --git a/modules/nagios/files/common/inc-debian.org b/modules/nagios/files/common/inc-debian.org
deleted file mode 100644 (file)
index bf4cd78..0000000
--- a/modules/nagios/files/common/inc-debian.org
+++ /dev/null
@@ -1,5 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-allowed_hosts=192.25.206.57,192.25.206.33

diff --git a/modules/nagios/files/per-host/caballero.debian.org/inc-debian.org b/modules/nagios/files/per-host/caballero.debian.org/inc-debian.org
deleted file mode 100644 (file)
index 5b3c372..0000000
--- a/modules/nagios/files/per-host/caballero.debian.org/inc-debian.org
+++ /dev/null
@@ -1,5 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-allowed_hosts=192.25.206.57,192.25.206.33,192.34.35.49

diff --git a/modules/nagios/files/per-host/mundy.debian.org/inc-debian.org b/modules/nagios/files/per-host/mundy.debian.org/inc-debian.org
deleted file mode 100644 (file)
index 5b3c372..0000000
--- a/modules/nagios/files/per-host/mundy.debian.org/inc-debian.org
+++ /dev/null
@@ -1,5 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-allowed_hosts=192.25.206.57,192.25.206.33,192.34.35.49

diff --git a/modules/nagios/files/per-host/penalosa.debian.org/inc-debian.org b/modules/nagios/files/per-host/penalosa.debian.org/inc-debian.org
deleted file mode 100644 (file)
index 5b3c372..0000000
--- a/modules/nagios/files/per-host/penalosa.debian.org/inc-debian.org
+++ /dev/null
@@ -1,5 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-allowed_hosts=192.25.206.57,192.25.206.33,192.34.35.49

diff --git a/modules/nagios/files/per-host/peri.debian.org/inc-debian.org b/modules/nagios/files/per-host/peri.debian.org/inc-debian.org
deleted file mode 100644 (file)
index 5b3c372..0000000
--- a/modules/nagios/files/per-host/peri.debian.org/inc-debian.org
+++ /dev/null
@@ -1,5 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-allowed_hosts=192.25.206.57,192.25.206.33,192.34.35.49

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index a49aec527b101dad251080b36c409e1df4d616db..5a799446a1b398c35fa7e149a7a8c768e5f8bf6f 100644 (file)
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -23,8 +23,7 @@ class nagios::client inherits nagios {
                        require => Package["nagios-nrpe-server"],
                        ensure  => directory;
                "/etc/nagios/nrpe.d/debianorg.cfg":
-                       source  => [ "puppet:///nagios/per-host/$fqdn/inc-debian.org",
-                                    "puppet:///nagios/common/inc-debian.org" ],
+                        content => template("nagios/inc-debian.org.erb"),
                        require => Package["nagios-nrpe-server"],
                        notify  => Exec["nagios-nrpe-server restart"];
                "/etc/nagios/nrpe.d/nrpe_dsa.cfg":

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
new file mode 100644 (file)
index 0000000..88b4dcb
--- /dev/null
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -0,0 +1,16 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+<%=
+nagii = [ '192.25.206.33', '82.195.75.106' ]
+
+case fqdn when
+  'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
+    nagii << '192.34.35.49'
+end
+
+out = "allowed_hosts=" + nagii.join(',')
+out
+%>