X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=7e84414b06d9569c0d64007abd60166bcba13f47;hb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;hp=be829182f8a14dac865beb054c7dc2a05cf61713;hpb=72663a7bca8ace527c596893b7103f50930575aa;p=dsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index be829182..7e84414b 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -5,7 +5,7 @@
 
 <%=
 nodeinfo = scope.lookupvar('site::nodeinfo')
-
+has_role = scope.function_has_role
 out = []
 
 restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
@@ -37,14 +37,18 @@ if restrict_ssh.include?(hostname) then
 	end
 
 	if %w{adayevskaya}.include?(hostname) then
-		ssh4allowed << %w{$HOST_MAILRELAY_V4}
-		ssh6allowed << %w{$HOST_MAILRELAY_V6}
+		ssh4allowed << %w{$HOST_DEBIAN_V4}
+		ssh6allowed << %w{$HOST_DEBIAN_V6}
+	end
+	if %w{denis}.include?(hostname) then
+		ssh4allowed << "5.153.231.5" # adayevskaya
+		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
 	end
 
-	if nodeinfo['static_master'] then
+	if has_role('static_master') then
 		ssh4allowed << '$HOST_STATIC_V4'
 		ssh6allowed << '$HOST_STATIC_V6'
-	elsif nodeinfo['static_source'] or nodeinfo['static_mirror'] then
+	elsif has_role('static_source') or has_role('static_mirror') then
 		ssh4allowed << '$HOST_STATICMASTER_V4'
 		ssh6allowed << '$HOST_STATICMASTER_V6'
 	end