X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=bae42b7f408c42b83c70a0ce3235e5ba3866d33e;hb=4cde20790e8a1c35eb50ca51a273fdd2975f2072;hp=f8a5755825b3a900bc89fcc21348840f58d45f8a;hpb=89a9f95e4afa7a9cb730db58868c02f1c0ba471a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index f8a575582..bae42b7f4 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -3,33 +3,48 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<%=
+out = []
 
-@def $SSH_SOURCES = (<%=
+restrict_ssh = %w{logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder}
 
-sshallowed = []
+ssh4allowed = []
+ssh6allowed = []
 
-case hostname
-  when 'logtest01', 'geo1', 'geo2', 'geo3' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
+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 sshallowed.length == 0
-  sshallowed = [ '0.0.0.0/0' ]
+if %w{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 );'
+	ssh4allowed << '$CARNET'
+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 << '::'
 
-sshallowed.join(' ')
-%>);
+out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 
-@def $SSH_V6_SOURCES = (<%=
 
-sshallowed = []
 
-case hostname
-  when 'logtest01', 'geo1', 'geo2', 'geo3' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
-end
 
-if sshallowed.length == 0
-  sshallowed = [ '::' ]
+smtp4allowed = []
+smtp6allowed = []
+
+if not nodeinfo['smarthost'].empty?
+  smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
+  smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
 end
 
-sshallowed.join(' ')
-%>);
+smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
+smtp6allowed.length == 0 and smtp6allowed << '::'
+
+out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
+out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
+
+out.join("\n")
+%>