Merge remote-tracking branch 'origin/master' into staging

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

diff --git a/modules/roles/manifests/debconf_wafer.pp b/modules/roles/manifests/debconf_wafer.pp
index 1fe443c..433c51b 100644 (file)
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -9,10 +9,18 @@ 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,
+       }
+       apache2::site { '010-debconf18.debconf.org':
+               site    => 'debconf18.debconf.org',
+               source => 'puppet:///modules/roles/debconf_wafer/debconf18.debconf.org',
+       }
 }