X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=75f0d5c46dec3f278ba62cb758f917eaea4bbd08;hb=3aa5ba8d9a9d12e3d8fe34e4bf897897a4dedf36;hp=72e65f422d1e423815a6591bbb50ce1e8924484e;hpb=e8b1328448828c884b998cd76ddca96826a58051;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 72e65f422..75f0d5c46 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -13,7 +13,7 @@ restrict_ssh = %w{tchaikovsky draghi adayevskaya}
 if (nodeinfo['ldap'].has_key?('purpose')) then
 	nodeinfo['ldap']['purpose'].each do |purp|
 		if restricted_purposes.include?(purp) then
-			restrict_ssh << hostname
+			restrict_ssh << @hostname
 		end
 	end
 end
@@ -21,7 +21,7 @@ end
 ssh4allowed = []
 ssh6allowed = []
 
-should_restrict = restrict_ssh.include?(hostname)
+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
@@ -29,16 +29,16 @@ should_restrict = restrict_ssh.include?(hostname)
 end
 
 
-if restrict_ssh.include?(hostname) then
+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{draghi}.include?(hostname) then
+	if %w{draghi}.include?(@hostname) then
 		ssh4allowed << '$HOST_DEBIAN_V4'
 		ssh6allowed << '$HOST_DEBIAN_V6'
 	end
 
-	if %w{adayevskaya}.include?(hostname) then
+	if %w{adayevskaya}.include?(@hostname) then
                 out << '@def $MFL_LOCAL = ( 130.83.226.60 );' # Michael Fladerer
                 ssh4allowed << '$MFL_LOCAL'
 		ssh4allowed << %w{$HOST_DEBIAN_V4}