X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=86ee156058b1f2c3eebafbf9653946fe67c8bbf9;hb=ee57adf5dcfffc062f5eda0458dbc4236db62072;hp=d60ff069b822efd0b91ba36c51d4138360a0ecee;hpb=90d74b627d41a7d9118a62b6aeb3cf55984aca9a;p=dsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index d60ff069..86ee1560 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -6,7 +6,16 @@
 <%=
 out = []
 
-restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder heininen handel lotti}
+restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'}
+restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini draghi}
+
+if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) then
+	scope.lookupvar('site::nodeinfo')['ldap']['purpose'].each do |purp|
+		if restricted_purposes.include?(purp) then
+			restrict_ssh << hostname
+		end
+	end
+end
 
 ssh4allowed = []
 ssh6allowed = []
@@ -20,13 +29,13 @@ if %w{lebrun schroeder}.include?(hostname) then
 	ssh4allowed << '$CARNET'
 	ssh4allowed << '$BUILDD_SSH_ACCESS'
 end
-if %w{beethoven}.include?(hostname) then
+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
+if %w{unger}.include?(hostname) then
+	ssh4allowed << '$UNGER_SSH_ACCESS'  # Ganneff
+	ssh6allowed << '$UNGER_SSH6_ACCESS' # Ganneff, but more address space
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
@@ -40,7 +49,7 @@ out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 smtp4allowed = []
 smtp6allowed = []
 
-if not nodeinfo['smarthost'].empty?
+if not scope.lookupvar('site::nodeinfo')['smarthost'].empty?
   smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
   smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
 end