X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=55b27e20cff336b5f02c1effd01a097a0547288c;hb=546ca0c41e746fb62605f7af3ccf11eaafe5fe0f;hp=f2f13a3b420c2cf759f954b253f8005568205560;hpb=22da90629d012e623abc61a5ee061e4627e89125;p=dsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index f2f13a3b..55b27e20 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 = []
@@ -17,13 +26,10 @@ if restrict_ssh.include?(hostname) then
 end
 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 );'
-	out << '@def $KIBI = ( 88.164.242.219 );'
 	ssh4allowed << '$CARNET'
-	ssh4allowed << '$KIBI'
-	ssh4allowed << '70.103.162.29' # master
-	ssh4allowed << '82.195.75.84'  # nott.ayous.org, HE (builddadm)
+	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
@@ -31,6 +37,14 @@ 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
 end
+if %w{pasquini tristano}.include?(hostname) then
+	ssh4allowed << '206.12.19.23'    # ganeti2.debian.org
+	ssh4allowed << '206.12.19.213'   # tristano.debian.org
+	ssh4allowed << '206.12.19.217'   # pasquini.debian.org
+	ssh4allowed << '192.168.2.23'    # ganeti2.debprivate-ubc.debian.org
+	ssh4allowed << '192.168.2.213'   # tristano-mnt.debprivate-ubc.debian.org
+	ssh4allowed << '192.168.2.217'   # pasquini-mnt.debprivate-ubc.debian.org
+end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
 
@@ -43,7 +57,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