X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebconf_wafer.pp;h=d64d06a5315ddb14d33d78e205a455c9fdf18728;hb=c7afa6d04e06776ac94206451153d6c0c0572495;hp=92223d91d4a28c4e7369b320223edffc76fbacda;hpb=594ba45a0aaf7be0ad8e74089342611fd56042f1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp
index 92223d91d..d64d06a53 100644
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -1,5 +1,6 @@
 class roles::debconf_wafer {
 	include apache2::ssl
+	include apache2::expires
 
 	package { 'libapache2-mod-wsgi-py3': ensure => installed, }
 	apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
@@ -8,10 +9,37 @@ class roles::debconf_wafer {
 		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':
+		notify  => Exec['service apache2 reload'],
+		key => true,
+		ensure => absent,
+	}
+	apache2::site { '010-debconf18.debconf.org':
+		site    => 'debconf18.debconf.org',
+		ensure  => absent,
+	}
+
+	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',
+	}
 }