prepare to add salieri to ganeti2

[dsa-puppet.git] / modules / ferm / templates / me.conf.erb

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 3de244eb3f7cc5d711cbcb9b68bcaf8f5e8e8848..69b8fa5dd21280d50fe6e94210232e7d412b5a21 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -7,7 +7,7 @@
 out = []
 
 restricted_purposes = {'kvm host', 'central syslog server', 'puppet master', 'jumphost'}
-restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder rossini draghi}
+restrict_ssh = %w{lebrun geo1 geo2 geo3 beethoven tchaikovsky schroeder draghi}
 
 if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) then
        scope.lookupvar('site::nodeinfo')['ldap']['purpose'].each do |purp|
@@ -33,9 +33,9 @@ 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
+if %w{unger}.include?(hostname) then
+       ssh4allowed << '$UNGER_SSH_ACCESS'  # Ganneff
+       ssh6allowed << '$UNGER_SSH6_ACCESS' # Ganneff, but more address space
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'