X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=829d71aae82b9fe55da53dc79bede6e3176df92f;hb=dcd05444f7179ed841fdb1cc786b6c1931724cbd;hp=690dc369cf4f1204195ed15000aff5c421f940fe;hpb=f906c34e9fb767be1c89efa8c2e5396fe210f30c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 690dc369c..829d71aae 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -3,71 +3,66 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-
-@def $SSH_SOURCES = (<%=
-
-sshallowed = []
-
-case hostname
-  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
+<%=
+nodeinfo = scope.lookupvar('deprecated::nodeinfo')
+out = []
+
+restricted_purposes = ['kvm host', 'ganeti/kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01 static-master-ubc-01 geo1 geo2 geo3 denis}
+
+if (nodeinfo['ldap'].has_key?('purpose')) then
+	nodeinfo['ldap']['purpose'].each do |purp|
+		if restricted_purposes.include?(purp) then
+			restrict_ssh << @hostname
+		end
+	end
 end
 
-case hostname
-  when 'bartok', 'beethoven' then sshallowed << '$HOST_DEBIAN_V4'
-end
+ssh4allowed = []
+ssh6allowed = []
 
-if sshallowed.length == 0
-  sshallowed = [ '0.0.0.0/0' ]
-end
+should_restrict = restrict_ssh.include?(@hostname)
 
-sshallowed.join(' ')
-%>);
 
-@def $SSH_V6_SOURCES = (<%=
+if should_restrict then
+	# draghi makes for a nice jumphost
+	ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4 $HOST_MUNIN_V4  82.195.75.106}
+	ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6  2001:41b8:202:deb:1a1a:0:52c3:4b6a}
 
-sshallowed = []
+	if %w{draghi}.include?(@hostname) then
+		ssh4allowed << '$HOST_DEBIAN_V4'
+		ssh6allowed << '$HOST_DEBIAN_V6'
+	end
 
-case hostname
-  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
+	if %w{adayevskaya}.include?(@hostname) then
+                out << '@def $MFL_LOCAL = ( 130.83.226.60 );' # Michael Fladerer
+                ssh4allowed << '$MFL_LOCAL'
+		ssh4allowed << %w{$HOST_DEBIAN_V4}
+		ssh6allowed << %w{$HOST_DEBIAN_V6}
+	end
 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    = ( $SSH_SOURCES    #{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = ( $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' ]
+  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
+smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
+smtp6allowed.length == 0 and smtp6allowed << '::/0'
 
-smtpallowed.join(' ')
-%>);
-
-def $SMTP_V6_SOURCES =(<%=
-
-smtpallowed = []
-
-if not nodeinfo['smarthost'].empty?
-  smtpallowed = [ '$HOST_MAILRELAY_V6' ]
-end
-
-if smtpallowed.length == 0
-  smtpallowed = [ '::' ]
-end
+out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
+out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
 
-smtpallowed.join(' ')
-%>);
+out.join("\n")
+%>