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

diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp
index d03bafc12..d64d06a53 100644
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -17,10 +17,11 @@ class roles::debconf_wafer {
 	ssl::service { 'debconf18.debconf.org':
 		notify  => Exec['service apache2 reload'],
 		key => true,
+		ensure => absent,
 	}
 	apache2::site { '010-debconf18.debconf.org':
 		site    => 'debconf18.debconf.org',
-		source => 'puppet:///modules/roles/debconf_wafer/debconf18.debconf.org',
+		ensure  => absent,
 	}
 
 	ssl::service { 'debconf19.debconf.org':
@@ -31,5 +32,14 @@ class roles::debconf_wafer {
 		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',
+	}
 }