X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=0ff422b3772640ad94d0738719def20499574346;hb=18f05c33c9dcdeadfeb0bbc73514bba660f03137;hp=0a80ab1fcf8ba120431b111be00e9332eb4ba323;hpb=17f88dc46046557b5a2c1152e3b58d26b46d5cf6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 0a80ab1fc..0ff422b37 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -3,8 +3,10 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<%
-restrict_ssh = %w{logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder}
+<%=
+out = []
+
+restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel}
 
 ssh4allowed = []
 ssh6allowed = []
@@ -13,19 +15,22 @@ if restrict_ssh.include?(hostname) then
 	ssh4allowed  << %w{$DSA_IPS $HOST_NAGIOS_V4 $HOST_DB_V4}
 	ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_DB_V6}
 end
-if %w{schroeder}.include?(hostname) then
-	puts '@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 );'
+if %w{lebrun schroeder}.include?(hostname) 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 );'
+	out << '@def $KIBI = ( 88.164.242.219 );'
 	ssh4allowed << '$CARNET'
+	ssh4allowed << '$KIBI'
+	ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
 end
 if %w{bartok beethoven}.include?(hostname) then
 	ssh4allowed << '$HOST_DEBIAN_V4'
 	ssh6allowed << '$HOST_DEBIAN_V6'
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
-ssh6allowed.length == 0 and ssh6allowed << '::'
+ssh6allowed.length == 0 and ssh6allowed << '::/0'
 
-puts "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});";
-puts "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});";
+out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 
 
 
@@ -41,7 +46,8 @@ end
 smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
 smtp6allowed.length == 0 and smtp6allowed << '::'
 
-puts "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});";
-puts "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});";
+out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
+out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
 
+out.join("\n")
 %>