X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=32c62e3bb5befb6c32be2c00c9fa25d352bc0439;hb=99df906318a8a9d9d1892cfef5eedf686e3b8de8;hp=7069f592a27b763a4a76148860fdc97893743045;hpb=f2cf3d153d0a682b54a067f0177e3b777ee4e60b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 7069f592a..32c62e3bb 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -9,8 +9,8 @@ out = []
 restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'}
 restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini draghi}
 
-if (nodeinfo['ldap'].has_key?('purpose')) then
-	nodeinfo['ldap']['purpose'].each do |purp|
+if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) then
+	scope.lookupvar('site::nodeinfo')['ldap']['purpose'].each do |purp|
 		if restricted_purposes.include?(purp) then
 			restrict_ssh << hostname
 		end
@@ -37,6 +37,14 @@ 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-mnt.debprivate-ubc.debian.org
+	ssh4allowed << '192.168.2.217'   # pasquini-mnt.debprivate-ubc.debian.org
+end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
 
@@ -49,7 +57,7 @@ out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
 smtp4allowed = []
 smtp6allowed = []
 
-if not nodeinfo['smarthost'].empty?
+if not scope.lookupvar('site::nodeinfo')['smarthost'].empty?
   smtp4allowed << %w{$HOST_MAILRELAY_V4 $HOST_NAGIOS_V4}
   smtp6allowed << %w{$HOST_MAILRELAY_V6 $HOST_NAGIOS_V6}
 end