X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsreview.pp;h=3ae5c90336b320fe50628455ca0eaf60d029dadd;hb=a2afb600d7d2187b16da01c98a50f00f06aea6a6;hp=0ccd7b4e35d9b0ce2f1a2ca240d123569fb08dfe;hpb=6c3d5358b372c0c92337a56435d1427c7b701cb7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/sreview.pp b/modules/roles/manifests/sreview.pp
index 0ccd7b4e3..3ae5c9033 100644
--- a/modules/roles/manifests/sreview.pp
+++ b/modules/roles/manifests/sreview.pp
@@ -1,25 +1,6 @@
 class roles::sreview {
-	ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+  include apache2
+  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',
-	}
-	file { '/var/lib/systemd/linger/sreview':
-		ensure => present,
-	}
+  dsa_systemd::linger { 'sreview': }
 }