X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=627e4bfae4440dc34d2abd4bfb480c15bb3022db;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=8ed108462262a00ae590b07875e9036cd75226a0;hpb=be6b89c6497aa1a34d3245105f69d675637b2812;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 8ed108462..627e4bfae 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -3,71 +3,85 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-
-@def $SSH_SOURCES = (<%=
-
-sshallowed = []
-
-case hostname
-  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
+<%=
+nodeinfo = scope.lookupvar('site::nodeinfo')
+out = []
+
+restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
+restrict_ssh = %w{tchaikovsky 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
 
-case hostname
-  when 'bartok', 'beethoven' then sshallowed << '$HOST_DEBIAN_V4'
-end
+ssh4allowed = []
+ssh6allowed = []
 
-if sshallowed.length == 0
-  sshallowed = [ '0.0.0.0/0' ]
+should_restrict = restrict_ssh.include?(@hostname)
+%w{dns_primary dns_geo}.each do |role_restrict|
+	if scope.function_has_role([role_restrict]) then
+		should_restrict = true
+	end
 end
 
-sshallowed.join(' ')
-%>);
 
-@def $SSH_V6_SOURCES = (<%=
-
-sshallowed = []
-
-case hostname
-  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok', 'beethoven' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
+if restrict_ssh.include?(@hostname) then
+	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{draghi}.include?(@hostname) then
+		ssh4allowed << '$HOST_DEBIAN_V4'
+		ssh6allowed << '$HOST_DEBIAN_V6'
+	end
+
+	if %w{adayevskaya}.include?(@hostname) then
+                out << '@def $MFL_LOCAL = ( 130.83.226.60 );' # Michael Fladerer
+                ssh4allowed << '$MFL_LOCAL'
+		ssh4allowed << %w{$HOST_DEBIAN_V4}
+		ssh6allowed << %w{$HOST_DEBIAN_V6}
+	end
+	if scope.function_has_role(['dns_primary']) then
+		ssh4allowed << "5.153.231.5" # adayevskaya
+		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
+		#ssh4allowed << "$HOST_DNS_GEO_V4"
+		#ssh6allowed << "$HOST_DNS_GEO_V6"
+	end
+
+	if scope.function_has_role(['static_master']) then
+		ssh4allowed << '$HOST_STATIC_V4'
+		ssh6allowed << '$HOST_STATIC_V6'
+	elsif scope.function_has_role(['static_source']) or
+	      scope.function_has_role(['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'
 
-case hostname
-  when 'bartok', 'beethoven' then sshallowed << '$HOST_DEBIAN_V6'
-end
+out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 
-if sshallowed.length == 0
-  sshallowed = [ '::' ]
-end
 
-sshallowed.join(' ')
-%>);
 
-def $SMTP_SOURCES =(<%=
 
-smtpallowed = []
+smtp4allowed = []
+smtp6allowed = []
 
 if not nodeinfo['smarthost'].empty?
-  smtpallowed = [ '$HOST_MAILRELAY_V4', '$HOST_NAGIOS_V4' ]
+  smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
+  smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
 end
 
-if smtpallowed.length == 0
-  smtpallowed = [ '0.0.0.0/0' ]
-end
-
-smtpallowed.join(' ')
-%>);
-
-def $SMTP_V6_SOURCES =(<%=
-
-smtpallowed = []
+smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
+smtp6allowed.length == 0 and smtp6allowed << '::/0'
 
-if not nodeinfo['smarthost'].empty?
-  smtpallowed = [ '$HOST_MAILRELAY_V6', '$HOST_NAGIOS_V6' ]
-end
-
-if smtpallowed.length == 0
-  smtpallowed = [ '::' ]
-end
+out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
+out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
 
-smtpallowed.join(' ')
-%>);
+out.join("\n")
+%>