projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
beethoven has ferm
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
templates
/
defs.conf.erb
diff --git
a/modules/ferm/templates/defs.conf.erb
b/modules/ferm/templates/defs.conf.erb
index
45fd624
..
2c97337
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-107,8
+107,8
@@
@def $HOST_DEBIAN_V4 = (<%=
dbs = []
@def $HOST_DEBIAN_V4 = (<%=
dbs = []
-
local
info.keys.sort.each do |node|
- next unless
(keyinfo[node].at(0) and keyinfo[node][0].has_key?('ipHostNumber')
)
+
key
info.keys.sort.each do |node|
+ next unless
keyinfo[node][0].has_key?('ipHostNumber'
)
keyinfo[node][0]['ipHostNumber'].each do |ip|
next if ip =~ /:/
dbs << ip
keyinfo[node][0]['ipHostNumber'].each do |ip|
next if ip =~ /:/
dbs << ip
@@
-120,8
+120,8
@@
@def $HOST_DEBIAN_V6 = (<%=
dbs = []
@def $HOST_DEBIAN_V6 = (<%=
dbs = []
-
local
info.keys.sort.each do |node|
- next unless
(keyinfo[node].at(0) and keyinfo[node][0].has_key?('ipHostNumber')
)
+
key
info.keys.sort.each do |node|
+ next unless
keyinfo[node][0].has_key?('ipHostNumber'
)
keyinfo[node][0]['ipHostNumber'].each do |ip|
next if ip =~ /\./
dbs << ip
keyinfo[node][0]['ipHostNumber'].each do |ip|
next if ip =~ /\./
dbs << ip
@@
-133,7
+133,7
@@
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
-@def $sgran = (91.103.132.24/29);
+@def $sgran = (91.103.132.24/29
85.158.45.51/32
);
@def $weasel = ();
@def $weasel = ($weasel 86.59.118.144/28); # debian@sil
@def $weasel = ($weasel 86.59.21.32/29); # anguilla1
@def $weasel = ();
@def $weasel = ($weasel 86.59.118.144/28); # debian@sil
@def $weasel = ($weasel 86.59.21.32/29); # anguilla1