X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=73c0809ee51d1935f3c24c2bbe46f72107977b2e;hb=d5aa695b724a15c751b4347d6ed894c371fb01db;hp=0a80ab1fcf8ba120431b111be00e9332eb4ba323;hpb=17f88dc46046557b5a2c1152e3b58d26b46d5cf6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 0a80ab1fc..73c0809ee 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -3,29 +3,56 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<%
-restrict_ssh = %w{logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder}
+<%=
+nodeinfo = scope.lookupvar('site::nodeinfo')
+
+out = []
+
+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{schroeder}.include?(hostname) then
-	puts '@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'
-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 << '::'
+ssh6allowed.length == 0 and ssh6allowed << '::/0'
 
-puts "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});";
-puts "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});";
+out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 
 
 
@@ -39,9 +66,10 @@ 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'
 
-puts "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});";
-puts "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});";
+out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
+out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
 
+out.join("\n")
 %>