X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=fcd13013f59f92cc818702a426ac803bf128ffe1;hb=381d9623ff6d4118b6e94981c7acb9e03c2544b3;hp=5257a1babdda0110e8fd3b47b001a0511b65e76d;hpb=3604999c2d83fc74306e17c747b059e04bde3f3c;p=dsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 5257a1ba..fcd13013 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,13 +4,15 @@
 ##
 
 <%=
+nodeinfo = scope.lookupvar('site::nodeinfo')
+
 out = []
 
-restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'}
-restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini draghi}
+restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
+restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder draghi adayevskaya}
 
-if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) then
-	scope.lookupvar('site::nodeinfo')['ldap']['purpose'].each do |purp|
+if (nodeinfo['ldap'].has_key?('purpose')) then
+	nodeinfo['ldap']['purpose'].each do |purp|
 		if restricted_purposes.include?(purp) then
 			restrict_ssh << hostname
 		end
@@ -21,29 +23,31 @@ 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 );'
-	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{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.debprivate-ubc.debian.org
-	ssh4allowed << '192.168.2.213'   # pasquini.debprivate-ubc.debian.org
+	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
+		ssh4allowed << %w{$HOST_MAILRELAY_V4}
+		ssh6allowed << %w{$HOST_MAILRELAY_V6}
+	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'
@@ -57,7 +61,7 @@ out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 smtp4allowed = []
 smtp6allowed = []
 
-if not scope.lookupvar('site::nodeinfo')['smarthost'].empty?
+if not nodeinfo['smarthost'].empty?
   smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
   smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
 end