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:
a6bdde9
)
Revert "I'm temporarily on borrowed ADSL"
author
Stephen Gran
<steve@lobefin.net>
Mon, 9 May 2011 18:40:38 +0000
(19:40 +0100)
committer
Stephen Gran
<steve@lobefin.net>
Mon, 9 May 2011 18:40:38 +0000
(19:40 +0100)
About time.
This reverts commit
05f75b180353ace7dbc4f39111a1151cc959f806
.
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
bb0a4f6
..
78a200f
100644
(file)
--- a/
modules/ferm/templates/defs.conf.erb
+++ b/
modules/ferm/templates/defs.conf.erb
@@
-168,7
+168,6
@@
@def $HOST_DEBIAN = ($HOST_DEBIAN_V4 $HOST_DEBIAN_V6);
@def $sgran = (91.103.132.24/29 85.158.45.51/32);
-@def $sgran = ($sgran 94.195.192.0/19); # Temporarily on O2 ADSL
@def $weasel = ();
@def $weasel = ($weasel 86.59.118.144/28); # debian@sil
@def $weasel = ($weasel 86.59.21.32/29); # anguilla1