Have the nm role declare its exim virtualdomain

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

diff --git a/modules/roles/manifests/debtags.pp b/modules/roles/manifests/debtags.pp
index b11e757..263de7c 100644 (file)
--- a/modules/roles/manifests/debtags.pp
+++ b/modules/roles/manifests/debtags.pp
@@ -1,14 +1,18 @@
 class roles::debtags {
-       include apache2::ssl
-       package { 'libapache2-mod-wsgi': ensure => installed, }
+  include apache2
+  include apache2::ssl
+  include roles::sso_rp
 
-       ssl::service { 'debtags.debian.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-debtags.debian.org':
-               site    => 'debtags.debian.org',
-               source => 'puppet:///modules/roles/debtags/debtags.debian.org',
-       }
+  ssl::service { 'debtags.debian.org':
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+
+  apache2::site { '010-debtags.debian.org':
+    site   => 'debtags.debian.org',
+    source => 'puppet:///modules/roles/debtags/debtags.debian.org',
+  }
 }