nm.d.o no longer needs access to projectb on bmdb1

[mirror/dsa-puppet.git] / modules / roles / manifests / sreview.pp

diff --git a/modules/roles/manifests/sreview.pp b/modules/roles/manifests/sreview.pp
index 0ccd7b4..3ae5c90 100644 (file)
--- 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': }
 }