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

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 73c0809ee..9a7dd8b01 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -5,11 +5,10 @@
 
 <%=
 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 draghi adayevskaya}
+restrict_ssh = %w{lebrun beethoven tchaikovsky schroeder draghi adayevskaya}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
 	nodeinfo['ldap']['purpose'].each do |purp|
@@ -22,8 +21,14 @@ end
 ssh4allowed = []
 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
+end
+
+
 if restrict_ssh.include?(hostname) then
-	ssh4allowed  << %w{$DSA_IPS   $HOST_NAGIOS_V4 $HOST_MUNIN_V4 $HOST_DB_V4}
+	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
@@ -35,15 +40,23 @@ if restrict_ssh.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
+
+	if %w{adayevskaya}.include?(hostname) then
+		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 nodeinfo['static_master'] then
+	if scope.function_has_role(['static_master']) then
 		ssh4allowed << '$HOST_STATIC_V4'
 		ssh6allowed << '$HOST_STATIC_V6'
-	elsif nodeinfo['static_source'] or nodeinfo['static_mirror'] then
+	elsif scope.function_has_role(['static_source']) or
+	      scope.function_has_role(['static_mirror']) then
 		ssh4allowed << '$HOST_STATICMASTER_V4'
 		ssh6allowed << '$HOST_STATICMASTER_V6'
 	end