X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=69b8fa5dd21280d50fe6e94210232e7d412b5a21;hb=df11d54a271217ab177aab7e1fac339a8478e130;hp=716233a8a9c967596ac057245d3a57295c856627;hpb=153b5910e94c201bde86d1fc23c300663663f559;p=dsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 716233a8..69b8fa5d 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -6,7 +6,16 @@
 <%=
 out = []
 
-restrict_ssh = %w{logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder}
+restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'}
+restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder 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 = []
@@ -15,17 +24,21 @@ 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{schroeder}.include?(hostname) then
+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 << '82.195.75.84' # nott.ayous.org, HE (builddadm)
+	ssh4allowed << '$BUILDD_SSH_ACCESS'
 end
-if %w{bartok beethoven}.include?(hostname) then
+if %w{beethoven draghi}.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
+end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
-ssh6allowed.length == 0 and ssh6allowed << '::'
+ssh6allowed.length == 0 and ssh6allowed << '::/0'
 
 out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
 out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
@@ -36,13 +49,13 @@ 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
 
 smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
-smtp6allowed.length == 0 and smtp6allowed << '::'
+smtp6allowed.length == 0 and smtp6allowed << '::/0'
 
 out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
 out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"