X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=33d0335e721f215943a9ab58d220752d1a61fefd;hb=732a5822dc5e92cd877704a535507c38f9c8ccb2;hp=32c62e3bb5befb6c32be2c00c9fa25d352bc0439;hpb=99df906318a8a9d9d1892cfef5eedf686e3b8de8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 32c62e3bb..33d0335e7 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 logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini 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,53 +21,32 @@ 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{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
-if %w{pasquini tristano}.include?(hostname) then
-	ssh4allowed << '206.12.19.23'    # ganeti2.debian.org
-	ssh4allowed << '206.12.19.213'   # tristano.debian.org
-	ssh4allowed << '206.12.19.217'   # pasquini.debian.org
-	ssh4allowed << '192.168.2.23'    # ganeti2.debprivate-ubc.debian.org
-	ssh4allowed << '192.168.2.213'   # tristano-mnt.debprivate-ubc.debian.org
-	ssh4allowed << '192.168.2.217'   # pasquini-mnt.debprivate-ubc.debian.org
-end
-ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
-ssh6allowed.length == 0 and ssh6allowed << '::/0'
+should_restrict = restrict_ssh.include?(@hostname)
 
-out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
-out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 
+if should_restrict then
+	# draghi makes for a nice jumphost
+	ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4   82.195.75.106}
+	ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6   2001:41b8:202:deb:1a1a:0:52c3:4b6a}
 
+	if %w{draghi}.include?(@hostname) then
+		ssh4allowed << '$HOST_DEBIAN_V4'
+		ssh6allowed << '$HOST_DEBIAN_V6'
+	end
 
-
-smtp4allowed = []
-smtp6allowed = []
-
-if not scope.lookupvar('site::nodeinfo')['smarthost'].empty?
-  smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
-  smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_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'
 
-smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
-smtp6allowed.length == 0 and smtp6allowed << '::/0'
+out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = ( $SSH_V6_SOURCES #{ssh6allowed.join(' ')});"
 
-out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
-out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
 
 out.join("\n")
 %>