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
3018fb5
..
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 beethoven tchaikovsky schroeder heininen handel
}
+restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 b
eethoven tchaikovsky schroeder heininen handel lotti
}
ssh4allowed = []
ssh6allowed = []
ssh4allowed = []
ssh6allowed = []
@@
-23,10
+23,14
@@
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
+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
ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
ssh6allowed.length == 0 and ssh6allowed << '::/0'
ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
ssh6allowed.length == 0 and ssh6allowed << '::/0'
@@
-45,7
+49,7
@@
if not nodeinfo['smarthost'].empty?
end
smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
end
smtp4allowed.length == 0 and smtp4allowed << '0.0.0.0/0'
-smtp6allowed.length == 0 and smtp6allowed << '::'
+smtp6allowed.length == 0 and smtp6allowed << '::
/0
'
out << "@def $SMTP_SOURCES = (#{smtp4allowed.join(' ')});"
out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"
out << "@def $SMTP_SOURCES = (#{smtp4allowed.join(' ')});"
out << "@def $SMTP_V6_SOURCES = (#{smtp6allowed.join(' ')});"