projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add master to carnet hosts
[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
87e0b40
..
3018fb5
100644
(file)
--- a/
modules/ferm/templates/me.conf.erb
+++ b/
modules/ferm/templates/me.conf.erb
@@
-20,7
+20,8
@@
if %w{lebrun schroeder}.include?(hostname) then
out << '@def $KIBI = ( 88.164.242.219 );'
ssh4allowed << '$CARNET'
ssh4allowed << '$KIBI'
out << '@def $KIBI = ( 88.164.242.219 );'
ssh4allowed << '$CARNET'
ssh4allowed << '$KIBI'
- ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
+ ssh4allowed << '70.103.162.29' # master
+ ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm)
end
if %w{bartok beethoven}.include?(hostname) then
ssh4allowed << '$HOST_DEBIAN_V4'
end
if %w{bartok beethoven}.include?(hostname) then
ssh4allowed << '$HOST_DEBIAN_V4'
@@
-32,10
+33,8
@@
ssh6allowed.length == 0 and ssh6allowed << '::/0'
out << "@def $SSH_SOURCES = (#{ssh4allowed.join(' ')});"
out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
out << "@def $SSH_SOURCES = (#{ssh4allowed.join(' ')});"
out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
-if %w{cilea}.include?(hostname) then
- out << '@hook pre "/sbin/modprobe nf_conntrack_sip";'
- out << '@hook pre "/sbin/modprobe nf_conntrack_h323";'
-end
+
+
smtp4allowed = []
smtp6allowed = []
smtp4allowed = []
smtp6allowed = []