X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=73c0809ee51d1935f3c24c2bbe46f72107977b2e;hb=7115759295ea10a57323206e27bc9fb09baf20bd;hp=3018fb531c5ea51352193bad626e8b8b07ac0514;hpb=7313b1a8e9dbf7b68faa1060e06b8a865844c495;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 3018fb531..73c0809ee 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,28 +4,49 @@
 ##
 
 <%=
+nodeinfo = scope.lookupvar('site::nodeinfo')
+
 out = []
 
-restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel}
+restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
+restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder draghi adayevskaya}
+
+if (nodeinfo['ldap'].has_key?('purpose')) then
+	nodeinfo['ldap']['purpose'].each do |purp|
+		if restricted_purposes.include?(purp) then
+			restrict_ssh << hostname
+		end
+	end
+end
 
 ssh4allowed = []
 ssh6allowed = []
 
 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{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)
-end
-if %w{bartok beethoven}.include?(hostname) then
-	ssh4allowed << '$HOST_DEBIAN_V4'
-	ssh6allowed << '$HOST_DEBIAN_V6'
+	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
+		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 << '$BUILDD_SSH_ACCESS'
+	end
+	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
+
+	if nodeinfo['static_master'] then
+		ssh4allowed << '$HOST_STATIC_V4'
+		ssh6allowed << '$HOST_STATIC_V6'
+	elsif nodeinfo['static_source'] or nodeinfo['static_mirror'] then
+		ssh4allowed << '$HOST_STATICMASTER_V4'
+		ssh6allowed << '$HOST_STATICMASTER_V6'
+	end
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
@@ -45,7 +66,7 @@ if not nodeinfo['smarthost'].empty?
 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(' ')});"