projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b4d3b35
)
More IPs for tfheen
author
Tollef Fog Heen
<tfheen@err.no>
Wed, 10 Aug 2011 05:55:24 +0000
(
05:55
+0000)
committer
Tollef Fog Heen
<tfheen@err.no>
Wed, 10 Aug 2011 05:55:57 +0000
(
05:55
+0000)
modules/ferm/templates/defs.conf.erb
patch
|
blob
|
history
diff --git
a/modules/ferm/templates/defs.conf.erb
b/modules/ferm/templates/defs.conf.erb
index
b9bc4ea
..
5fd19fd
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-180,7
+180,9
@@
@def $zobel = ($zobel 78.47.2.104/29); # baldur, bragi, saga
@def $luca = (64.71.152.109);
@def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
@def $zobel = ($zobel 78.47.2.104/29); # baldur, bragi, saga
@def $luca = (64.71.152.109);
@def $paravoid = (83.212.9.72); # faidon.noc.grnet.gr
-@def $tfheen = (87.238.43.224/27);
+@def $tfheen = ();
+@def $tfheen = ($tfheen 87.238.43.224/27); # office network
+@def $tfheen = ($tfheen 77.40.198.10); # home
@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen);
@def $sgran6 = (2001:4b10:100b::/48);
@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen);
@def $sgran6 = (2001:4b10:100b::/48);
@@
-195,7
+197,9
@@
@def $zobel6 = ($zobel6 2a01:198:6b2::/48); # AdS20
@def $luca6 = ();
@def $paravoid6 = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
@def $zobel6 = ($zobel6 2a01:198:6b2::/48); # AdS20
@def $luca6 = ();
@def $paravoid6 = (2001:648:2340:1:225:64ff:fea4:8590); # faidon.noc.grnet.gr
-@def $tfheen6 = (2a02:c0:1013:1::/64);
+@def $tfheen6 = ();
+@def $tfheen6 = ($tfheen6 2a02:c0:1013:1::/64);
+@def $tfheen6 = ($tfheen6 2001:16d8:ee48::/48); # home
@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6);
@def $USER_christoph = ();
@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6);
@def $USER_christoph = ();