add lw07 to snapshot_web group

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 05cd17a..8e83318 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -355,6 +355,7 @@ roles:
   alioth_archive:
     - grabbe.debian.org
   snapshot_web:
+    - lw07.debian.org
     - sallinen.debian.org
   kanboard:
     - kantuser.debian.org

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index e527d3c..e2c0ae8 100644 (file)
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -81,16 +81,6 @@ class ferm::per_host {
                                rule            => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081',
                        }
                }
-               lw07: {
-                       @ferm::rule { 'dsa-snapshot-varnish':
-                               rule            => '&SERVICE(tcp, 6081)',
-                       }
-                       @ferm::rule { 'dsa-nat-snapshot-varnish':
-                               table           => 'nat',
-                               chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 185.17.185.185 dport 80 REDIRECT to-ports 6081',
-                       }
-               }
                default: {}
        }
        case $::hostname {

diff --git a/modules/roles/manifests/snapshot_web.pp b/modules/roles/manifests/snapshot_web.pp
index 6054b52..be21714 100644 (file)
--- a/modules/roles/manifests/snapshot_web.pp
+++ b/modules/roles/manifests/snapshot_web.pp
@@ -14,6 +14,11 @@ class roles::snapshot_web {
        }
 
        case $::hostname {
+               'lw07': {
+                       $ipv4addr        = '185.17.185.185'
+                       $ipv6addr        = '2001:1af8:4020:b030:deb::185'
+                       $ipv6addr_apache = '2001:1af8:4020:b030:deb::187'
+               }
                'sallinen': {
                        $ipv4addr        = '193.62.202.27'
                        $ipv6addr        = '2001:630:206:4000:1a1a:0:c13e:ca1b'