X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=3018fb531c5ea51352193bad626e8b8b07ac0514;hb=7313b1a8e9dbf7b68faa1060e06b8a865844c495;hp=4efebbe84022a9d1ae8acaa622bd859d36b8fae7;hpb=60e46ef338ce65d648a574ffb7d0a852dca05aaf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 4efebbe84..3018fb531 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,79 +4,51 @@
 ##
 
 <%=
-  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
-%>
+out = []
 
-@def $SSH_SOURCES = (<%=
+restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel}
 
-sshallowed = []
+ssh4allowed = []
+ssh6allowed = []
 
-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' ]
+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
-
-case hostname
-  when 'bartok', 'beethoven' then sshallowed << '$HOST_DEBIAN_V4'
+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 << '70.103.162.29' # master
+	ssh4allowed << '82.195.75.84'  # nott.ayous.org, HE (builddadm)
 end
-
-if sshallowed.length == 0
-  sshallowed = [ '0.0.0.0/0' ]
-end
-
-sshallowed.join(' ')
-%>);
-
-@def $SSH_V6_SOURCES = (<%=
-
-sshallowed = []
-
-case hostname
-  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven', 'schroeder', 'tchaikovsky' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
+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 << '::/0'
 
-case hostname
-  when 'bartok', 'beethoven' then sshallowed << '$HOST_DEBIAN_V6'
-end
+out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 
-if sshallowed.length == 0
-  sshallowed = [ '::' ]
-end
 
-sshallowed.join(' ')
-%>);
 
-def $SMTP_SOURCES =(<%=
 
-smtpallowed = []
+smtp4allowed = []
+smtp6allowed = []
 
 if not nodeinfo['smarthost'].empty?
-  smtpallowed = [ '$HOST_MAILRELAY_V4', '$HOST_NAGIOS_V4' ]
+  smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
+  smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
 end
 
-if smtpallowed.length == 0
-  smtpallowed = [ '0.0.0.0/0' ]
-end
-
-smtpallowed.join(' ')
-%>);
-
-def $SMTP_V6_SOURCES =(<%=
+smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
+smtp6allowed.length == 0 and smtp6allowed << '::'
 
-smtpallowed = []
+out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
+out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
 
-if not nodeinfo['smarthost'].empty?
-  smtpallowed = [ '$HOST_MAILRELAY_V6', '$HOST_NAGIOS_V6' ]
-end
-
-if smtpallowed.length == 0
-  smtpallowed = [ '::' ]
-end
-
-smtpallowed.join(' ')
-%>);
+out.join("\n")
+%>