projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/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
b88d974
..
f2f13a3
100644
(file)
--- a/
modules/ferm/templates/me.conf.erb
+++ b/
modules/ferm/templates/me.conf.erb
@@
-6,7
+6,7
@@
<%=
out = []
<%=
out = []
-restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 b
artok b
eethoven tchaikovsky schroeder heininen handel lotti}
+restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder heininen handel lotti}
ssh4allowed = []
ssh6allowed = []
ssh4allowed = []
ssh6allowed = []
@@
-23,7
+23,7
@@
if %w{lebrun schroeder}.include?(hostname) then
ssh4allowed << '70.103.162.29' # master
ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
end
ssh4allowed << '70.103.162.29' # master
ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
end
-if %w{b
artok b
eethoven}.include?(hostname) then
+if %w{beethoven}.include?(hostname) then
ssh4allowed << '$HOST_DEBIAN_V4'
ssh6allowed << '$HOST_DEBIAN_V6'
end
ssh4allowed << '$HOST_DEBIAN_V4'
ssh6allowed << '$HOST_DEBIAN_V6'
end