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

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 829d71aae..086a81832 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -8,7 +8,7 @@ nodeinfo = scope.lookupvar('deprecated::nodeinfo')
 out = []
 
 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-ubc-01 geo1 geo2 geo3 denis}
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01 static-master-manda-01 static-master-ubc-01 geo1 geo2 geo3 denis}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
 	nodeinfo['ldap']['purpose'].each do |purp|
@@ -18,51 +18,31 @@ if (nodeinfo['ldap'].has_key?('purpose')) then
 	end
 end
 
-ssh4allowed = []
-ssh6allowed = []
+sshallowed = []
 
 should_restrict = restrict_ssh.include?(@hostname)
 
-
 if should_restrict then
 	# draghi makes for a nice jumphost
-	ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4 $HOST_MUNIN_V4  82.195.75.106}
-	ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6  2001:41b8:202:deb:1a1a:0:52c3:4b6a}
+	sshallowed << %w{$DSA_IPS 82.195.75.106 2001:41b8:202:deb:1a1a:0:52c3:4b6a}
 
 	if %w{draghi}.include?(@hostname) then
-		ssh4allowed << '$HOST_DEBIAN_V4'
-		ssh6allowed << '$HOST_DEBIAN_V6'
+		sshallowed << '$HOST_DEBIAN'
 	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}
+		out << '@def $MFL_LOCAL = ( 130.83.226.60 );' # Michael Fladerer
+		sshallowed << '$MFL_LOCAL'
+		sshallowed << %w{$HOST_DEBIAN}
 	end
 end
-ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
-ssh6allowed.length == 0 and ssh6allowed << '::/0'
-
-out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{ssh4allowed.join(' ')});"
-out << "@def $SSH_V6_SOURCES = ( $SSH_V6_SOURCES #{ssh6allowed.join(' ')});"
-
-
-
-
-smtp4allowed = []
-smtp6allowed = []
-
-if not nodeinfo['smarthost'].empty?
-  smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
-  smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
+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 << '::/0'
+out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{sshallowed.join(' ')});"
 
-out << "@def $SMTP_SOURCES    = (#{smtp4allowed.join(' ')});"
-out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
 
 out.join("\n")
 %>