X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=627e4bfae4440dc34d2abd4bfb480c15bb3022db;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=55b27e20cff336b5f02c1effd01a097a0547288c;hpb=2998fda622b3c2eaf9e2e971d5753d0607a05513;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 55b27e20c..627e4bfae 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,13 +4,14 @@
 ##
 
 <%=
+nodeinfo = scope.lookupvar('site::nodeinfo')
 out = []
 
-restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'}
-restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini draghi}
+restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
+restrict_ssh = %w{tchaikovsky draghi adayevskaya}
 
-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
 		end
@@ -20,30 +21,44 @@ 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
+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{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
+
+
+if restrict_ssh.include?(@hostname) 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(['dns_primary']) then
+		ssh4allowed << "5.153.231.5" # adayevskaya
+		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
+		#ssh4allowed << "$HOST_DNS_GEO_V4"
+		#ssh6allowed << "$HOST_DNS_GEO_V6"
+	end
+
+	if scope.function_has_role(['static_master']) then
+		ssh4allowed << '$HOST_STATIC_V4'
+		ssh6allowed << '$HOST_STATIC_V6'
+	elsif scope.function_has_role(['static_source']) or
+	      scope.function_has_role(['static_mirror']) then
+		ssh4allowed << '$HOST_STATICMASTER_V4'
+		ssh6allowed << '$HOST_STATICMASTER_V6'
+	end
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
@@ -57,7 +72,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