From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Sep 2019 08:43:23 +0000 (+0200)
Subject: Remove temporary DC19 rules for roles::sreview
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2a425a85aee59abba7f8de4b9bb6f61824938d82;p=mirror%2Fdsa-puppet.git

Remove temporary DC19 rules for roles::sreview
---

diff --git a/modules/roles/manifests/sreview.pp b/modules/roles/manifests/sreview.pp
index 1bc91edd8..89c01d201 100644
--- a/modules/roles/manifests/sreview.pp
+++ b/modules/roles/manifests/sreview.pp
@@ -1,20 +1,6 @@
 class roles::sreview {
 	ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 
-	$now = Timestamp()
-	$date = $now.strftime('%F')
-
-	if versioncmp($date, '2019-08-15') <= 0 {
-		ferm::rule { 'temporary-dc19-access':
-			description     => 'temporarily allow DC19 access, cf. RT#7845',
-			rule            => '&SERVICE_RANGE(tcp, 5432, ( 200.134.17.48/28 ))',
-		}
-	} else {
-		# also clean up pg_hba on vittoria
-		notify {"Temporary DC19 ferm rule expired, cf. RT#7845":
-			loglevel => warning, }
-	}
-
 	file { '/var/lib/systemd/linger':
 		ensure => directory,
 		mode   => '755',