X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=d0a9aa5d2a49387321fdd5276aba9c4baf6c7540;hb=cdf648b13dacc11edd25af11c93a67dbe7097743;hp=331ef52aab048a348963b3248b6a533b10d24f91;hpb=9beaf0ec40f9e6496afe34c4391b7913ecee33ee;p=dsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 331ef52a..d0a9aa5d 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,25 +4,66 @@
 ##
 
 <%=
+nodeinfo = scope.lookupvar('site::nodeinfo')
 out = []
 
-restrict_ssh = %w{logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel}
+restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
+restrict_ssh = %w{lebrun 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}
+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
-if %w{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)
-end
-if %w{bartok beethoven}.include?(hostname) then
-	ssh4allowed << '$HOST_DEBIAN_V4'
-	ssh6allowed << '$HOST_DEBIAN_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{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{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'
@@ -42,7 +83,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(' ')});"