From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 28 May 2018 21:12:24 +0000 (+0200)
Subject: add lw07 to snapshot_web group
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=4e8859da2c042d6a41d5eebf39c0c65cd17eebcb

add lw07 to snapshot_web group
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 05cd17abb..8e833181a 100644
--- 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 e527d3c97..e2c0ae8f6 100644
--- 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 6054b5227..be217144b 100644
--- 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'