X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=086a81832a5b3497fff6ab24bc1aadd13213e614;hb=8fc2f013fa1510bcb2e53f7b307d371ae99cfebb;hp=bae42b7f408c42b83c70a0ce3235e5ba3866d33e;hpb=4cde20790e8a1c35eb50ca51a273fdd2975f2072;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index bae42b7f4..086a81832 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,47 +4,45 @@
 ##
 
 <%=
+nodeinfo = scope.lookupvar('deprecated::nodeinfo')
 out = []
 
-restrict_ssh = %w{logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder}
+restricted_purposes = ['kvm host', 'ganeti/kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01 static-master-manda-01 static-master-ubc-01 geo1 geo2 geo3 denis}
 
-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
-	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'
-end
-if %w{bartok beethoven}.include?(hostname) then
-	ssh4allowed << '$HOST_DEBIAN_V4'
-	ssh6allowed << '$HOST_DEBIAN_V6'
+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.length == 0 and ssh4allowed << '0.0.0.0/0'
-ssh6allowed.length == 0 and ssh6allowed << '::'
 
-out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
-out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
+sshallowed = []
 
+should_restrict = restrict_ssh.include?(@hostname)
 
+if should_restrict then
+	# draghi makes for a nice jumphost
+	sshallowed << %w{$DSA_IPS 82.195.75.106 2001:41b8:202:deb:1a1a:0:52c3:4b6a}
 
+	if %w{draghi}.include?(@hostname) then
+		sshallowed << '$HOST_DEBIAN'
+	end
 
-smtp4allowed = []
-smtp6allowed = []
-
-if not nodeinfo['smarthost'].empty?
-  smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
-  smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
+	if %w{adayevskaya}.include?(@hostname) then
+		out << '@def $MFL_LOCAL = ( 130.83.226.60 );' # Michael Fladerer
+		sshallowed << '$MFL_LOCAL'
+		sshallowed << %w{$HOST_DEBIAN}
+	end
+end
+if sshallowed.length == 0 then
+  sshallowed << '0.0.0.0/0'
+  sshallowed << '::/0'
 end
 
-smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
-smtp6allowed.length == 0 and smtp6allowed << '::'
+out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{sshallowed.join(' ')});"
 
-out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
-out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
 
 out.join("\n")
 %>