X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=1637b3b877918ab8d2d10ce761be5498c64d1b20;hb=7a49d7afd1a5e7c5974f3fa375c0149f4c711276;hp=a7729e996860d9c95fd32011b333e17c21bf94f4;hpb=560def7d3ac0c917c2d299a112a43a942434cc85;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index a7729e996..1637b3b87 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -3,11 +3,54 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<%=
+out = []
 
-@def $SSH_SOURCES = (<%=
-sshallowed = []
-case hostname
-  when 'logtest01' then sshallowed << [ '91.103.132.25', '91.103.132.49' ]
+restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder heininen handel lotti}
+
+ssh4allowed = []
+ssh6allowed = []
+
+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{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 );'
+	ssh4allowed << '$CARNET'
+	ssh4allowed << '70.103.162.29' # master
+	ssh4allowed << '82.195.75.84'  # nott.ayous.org, HE (builddadm)
+end
+if %w{beethoven}.include?(hostname) then
+	ssh4allowed << '$HOST_DEBIAN_V4'
+	ssh6allowed << '$HOST_DEBIAN_V6'
 end
-sshallowed.join(' ')
-%>);
+if %w{geo1 geo2 geo3}.include?(hostname) then
+	ssh4allowed << '194.177.211.209' # orff - master
+	ssh6allowed << '2001:648:2ffc:deb:213:72ff:fe69:e188' # orff - master
+end
+ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
+ssh6allowed.length == 0 and ssh6allowed << '::/0'
+
+out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
+
+
+
+
+smtp4allowed = []
+smtp6allowed = []
+
+if not nodeinfo['smarthost'].empty?
+  smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
+  smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
+end
+
+smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
+smtp6allowed.length == 0 and smtp6allowed << '::/0'
+
+out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
+out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
+
+out.join("\n")
+%>