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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 1cdfaaf521f0cf36e87062dd31cc90f925c24b03..6a36dd90c86f1f2d4ffc8db5db7ae56c22778517 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -99,7 +99,6 @@ nameinfo:
   zelenka.debian.org: Jan Dismas Zelenka (16 October 1679 - 23 December 1745)
 footer:
   lebrun.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
-  schroeder.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
   zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index db39f14751bb65b3648b9a89b76fca4128c332b4..af6585a5c7de963b67876e0e75a2307e95b37dbd 100644 (file)
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,5 +1,17 @@
-def $MUNIN_IPS = (<%= v4ips.split(',').join(' ') %>);
-def $MUNIN6_IPS = (<%= v6ips == 'no' ? '' : v6ips.split(',').join(' ') %>);
+def $MUNIN_IPS = (<%=
+begin
+       v4ips.split(',').join(' ')
+rescue
+       ''
+end
+%>);
+def $MUNIN6_IPS = (<%=
+begin
+       v6ips == 'no' ? '' : v6ips.split(',').join(' ')
+rescue
+       ''
+end
+%>);
 
 domain ip {
         chain INPUT {

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 1f0262f0b68bdff35bcbee940c4e3cb0f32e1bc8..4efebbe84022a9d1ae8acaa622bd859d36b8fae7 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -3,6 +3,14 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<%=
+  out=''
+  case hostname
+  when 'schroeder' then 
+    out = '@def $CARNET = ( 193.198.184.8/29 161.53.160.133 161.53.160.90 161.53.11.222 161.53.12.134 161.53.12.142 161.53.12.143 );'
+  end
+  out
+%>
 
 @def $SSH_SOURCES = (<%=
 
@@ -10,6 +18,7 @@ sshallowed = []
 
 case hostname
   when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven', 'tchaikovsky' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
+  when 'schroeder' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4', '$CARNET' ]
 end
 
 case hostname
@@ -28,7 +37,7 @@ sshallowed.join(' ')
 sshallowed = []
 
 case hostname
-  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven', 'tchaikovsky' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
+  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven', 'schroeder', 'tchaikovsky' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
 end
 
 case hostname