From: Stephen Gran <steve@lobefin.net>
Date: Mon, 9 May 2011 18:40:38 +0000 (+0100)
Subject: Revert "I'm temporarily on borrowed ADSL"
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7a49d7afd1a5e7c5974f3fa375c0149f4c711276;p=dsa-puppet.git

Revert "I'm temporarily on borrowed ADSL"

About time.
This reverts commit 05f75b180353ace7dbc4f39111a1151cc959f806.
---

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index bb0a4f62..78a200fd 100644
--- 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