Have the nm role declare its exim virtualdomain

[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 92223d9..e799875 100644 (file)
--- a/modules/roles/manifests/debconf_wafer.pp
+++ b/modules/roles/manifests/debconf_wafer.pp
@@ -1,17 +1,48 @@
 class roles::debconf_wafer {
-       include apache2::ssl
+  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,
-       }
+  package { 'libapache2-mod-wsgi-py3': ensure => installed, }
+  apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
 
-       apache2::site { '010-wafertest.debconf.org':
-               site    => 'wafertest.debconf.org',
-               source => 'puppet:///modules/roles/debconf_wafer/wafertest.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',
+  }
 }