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

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 69b8fa5dd..829d71aae 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,15 +4,16 @@
 ##
 
 <%=
+nodeinfo = scope.lookupvar('deprecated::nodeinfo')
 out = []
 
-restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'}
-restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder draghi}
+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 (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) then
-	scope.lookupvar('site::nodeinfo')['ldap']['purpose'].each do |purp|
+if (nodeinfo['ldap'].has_key?('purpose')) then
+	nodeinfo['ldap']['purpose'].each do |purp|
 		if restricted_purposes.include?(purp) then
-			restrict_ssh << hostname
+			restrict_ssh << @hostname
 		end
 	end
 end
@@ -20,28 +21,31 @@ end
 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 << '$BUILDD_SSH_ACCESS'
-end
-if %w{beethoven draghi}.include?(hostname) then
-	ssh4allowed << '$HOST_DEBIAN_V4'
-	ssh6allowed << '$HOST_DEBIAN_V6'
-end
-if %w{unger}.include?(hostname) then
-	ssh4allowed << '$UNGER_SSH_ACCESS'  # Ganneff
-	ssh6allowed << '$UNGER_SSH6_ACCESS' # Ganneff, but more address space
+should_restrict = restrict_ssh.include?(@hostname)
+
+
+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}
+
+	if %w{draghi}.include?(@hostname) then
+		ssh4allowed << '$HOST_DEBIAN_V4'
+		ssh6allowed << '$HOST_DEBIAN_V6'
+	end
+
+	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'
 
-out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
-out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
+out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = ( $SSH_V6_SOURCES #{ssh6allowed.join(' ')});"
 
 
 
@@ -49,7 +53,7 @@ out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 smtp4allowed = []
 smtp6allowed = []
 
-if not scope.lookupvar('site::nodeinfo')['smarthost'].empty?
+if not nodeinfo['smarthost'].empty?
   smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
   smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
 end