X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebconf_wafer.pp;h=e799875b600fd65cc9b84791b7c41c82aa70755e;hb=64c1545f242396ff122e1af0ce35cf952a01c58c;hp=433c51bf4aa0c711e5968b75d312dfd710a0ce99;hpb=faa68c366be578fae99e9e1e5d609cbc6bd9279d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp
index 433c51bf4..e799875b6 100644
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -1,26 +1,48 @@
 class roles::debconf_wafer {
-	include apache2::ssl
-	include apache2::expires
+  include apache2
+  include apache2::ssl
+  include apache2::expires
 
-	package { 'libapache2-mod-wsgi-py3': ensure => installed, }
-	apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
+  include roles::sso_rp
 
-	ssl::service { 'wafertest.debconf.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
-	apache2::site { '010-wafertest.debconf.org':
-		site    => 'wafertest.debconf.org',
-		source => 'puppet:///modules/roles/debconf_wafer/wafertest.debconf.org',
-	}
+  package { 'libapache2-mod-wsgi-py3': ensure => installed, }
+  apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
 
-	ssl::service { 'debconf18.debconf.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
-	apache2::site { '010-debconf18.debconf.org':
-		site    => 'debconf18.debconf.org',
-		source => 'puppet:///modules/roles/debconf_wafer/debconf18.debconf.org',
-	}
+  ssl::service { 'wafertest.debconf.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  apache2::site { '010-wafertest.debconf.org':
+    site   => 'wafertest.debconf.org',
+    source => 'puppet:///modules/roles/debconf_wafer/wafertest.debconf.org',
+  }
+
+  ssl::service { 'debconf18.debconf.org':
+    ensure => absent,
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  apache2::site { '010-debconf18.debconf.org':
+    ensure => absent,
+    site   => 'debconf18.debconf.org',
+  }
+
+  ssl::service { 'debconf19.debconf.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  apache2::site { '010-debconf19.debconf.org':
+    site   => 'debconf19.debconf.org',
+    source => 'puppet:///modules/roles/debconf_wafer/debconf19.debconf.org',
+  }
+
+  ssl::service { 'debconf20.debconf.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  apache2::site { '010-debconf20.debconf.org':
+    site   => 'debconf20.debconf.org',
+    source => 'puppet:///modules/roles/debconf_wafer/debconf20.debconf.org',
+  }
 }