X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=7e959d4fd722b4ebac85c7a138f25d6a84407513;hb=4fea88ca758ac7f9a4a1a6909040403245004727;hp=cfb8a3e27f55537da2dd7ca2961370af3be02e19;hpb=81d1f153e85a12ee1a9a1276970f1b3c5572aef9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index cfb8a3e27..7e959d4fd 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -3,10 +3,53 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<%=
+out = []
 
-@def $SSH_SOURCES = <%
-ssh_allowed = case nodename
-  when 'logtest01' then '0.0.0.0/0'
+restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel}
+
+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 );'
+	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 << '::/0'
+
+out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
+
+if %w{cilea}.include?(hostname) then
+	out << 'hook pre "/sbin/modprobe nf_conntrack_sip";'
+	out << 'hook pre "/sbin/modprobe nf_conntrack_h323";'
 end
-ssh_allowed
+
+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 << '::'
+
+out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
+out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
+
+out.join("\n")
 %>