X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=73970da0ab6e5a1945111e072aff0d8ae48d3b13;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=11939ebd090cc30b2a255a063479bff7b8678c5d;hpb=3ce119f19443e40db3f4570473938c0de059ac85;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 11939ebd0..73970da0a 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,33 +4,85 @@
 ##
 
 <%=
+nodeinfo = scope.lookupvar('deprecated::nodeinfo')
 out = []
 
-restrict_ssh = %w{logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel}
+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}
+
+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
 
 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}
+should_restrict = restrict_ssh.include?(@hostname)
+%w{dns_primary dns_geo}.each do |role_restrict|
+	if scope.function_has_role([role_restrict]) then
+		should_restrict = true
+	end
 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'
+
+
+if should_restrict then
+	ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4 $HOST_MUNIN_V4 $HOST_DB_V4}
+	ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6 $HOST_DB_V6}
+
+	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
+
+	if scope.function_has_role(['debian_mirror']) or
+	   scope.function_has_role(['security_mirror']) or
+	   scope.function_has_role(['debug_mirror']) or
+	   scope.function_has_role(['historical_mirror']) or
+	   scope.function_has_role(['syncproxy']) then
+		ssh4allowed << '$HOST_MIRRORMASTER_V4'
+		ssh6allowed << '$HOST_MIRRORMASTER_V6'
+	end
+	if scope.function_has_role(['debian_mirror']) or
+	   scope.function_has_role(['syncproxy']) then
+		ssh4allowed << '$HOST_SYNCPROXY_V4'
+		ssh6allowed << '$HOST_SYNCPROXY_V6'
+	end
+	if scope.function_has_role(['security_mirror']) or
+	   scope.function_has_role(['syncproxy']) then
+		ssh4allowed << '$HOST_SECMASTER_V4'
+		ssh6allowed << '$HOST_SECMASTER_V6'
+	end
+	if scope.function_has_role(['historical_mirror']) then
+		ssh4allowed << '$HOST_ARCHIVEMASTER_V4'
+		ssh6allowed << '$HOST_ARCHIVEMASTER_V6'
+	end
+	if scope.function_has_role(['syncproxy']) then
+		ssh4allowed << '$HOST_FTPMASTER_V4'
+		ssh6allowed << '$HOST_FTPMASTER_V6'
+		ssh4allowed << '$HOST_PORTSMASTER_V4'
+		ssh6allowed << '$HOST_PORTSMASTER_V6'
+	end
+	if scope.function_has_role(['debug_mirror']) then
+		ssh4allowed << '$HOST_FTPMASTER_V4'
+		ssh6allowed << '$HOST_FTPMASTER_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(' ')});"
 
 
 
@@ -44,7 +96,7 @@ if not nodeinfo['smarthost'].empty?
 end
 
 smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
-smtp6allowed.length == 0 and smtp6allowed << '::'
+smtp6allowed.length == 0 and smtp6allowed << '::/0'
 
 out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
 out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"