X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=72e65f422d1e423815a6591bbb50ce1e8924484e;hb=39cd73a3d3b8ad1226dc72f42cefd45d5a3f1287;hp=9a7dd8b01edacfd9f9078050754fbbd6e0b03a1d;hpb=8467acd82ff1d92e9825361d717721bd3b38e26f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 9a7dd8b01..72e65f422 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -8,7 +8,7 @@ nodeinfo = scope.lookupvar('site::nodeinfo')
 out = []
 
 restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
-restrict_ssh = %w{lebrun beethoven tchaikovsky schroeder draghi adayevskaya}
+restrict_ssh = %w{tchaikovsky draghi adayevskaya}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
 	nodeinfo['ldap']['purpose'].each do |purp|
@@ -23,7 +23,9 @@ ssh6allowed = []
 
 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
+	if scope.function_has_role([role_restrict]) then
+		should_restrict = true
+	end
 end
 
 
@@ -31,25 +33,22 @@ 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{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
+	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"
+		#ssh4allowed << "$HOST_DNS_GEO_V4"
+		#ssh6allowed << "$HOST_DNS_GEO_V6"
 	end
 
 	if scope.function_has_role(['static_master']) then