X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fveyepar.pp;h=e0a8908d5ef5b1f2c5abab3c4d112fc74f10f8ca;hb=dcd05444f7179ed841fdb1cc786b6c1931724cbd;hp=4f8aa2198113675ecdca8b4fad497c7c42297672;hpb=97d3bb4262e808c728c0a19dcbbad3a12c0748e5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/veyepar.pp b/modules/roles/manifests/veyepar.pp
index 4f8aa2198..e0a8908d5 100644
--- a/modules/roles/manifests/veyepar.pp
+++ b/modules/roles/manifests/veyepar.pp
@@ -1,16 +1,4 @@
 class roles::veyepar {
-	ssl::service { 'veyepar.debian.org': 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 {
-		notify {"Temporary DC19 ferm rule expired, cf. RT#7845":
-			loglevel => warning, }
-	}
+  include apache2
+  ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 }