X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fdebtags.pp;h=8e350c6eb399d139b39b0252ce92081cf12c20c0;hb=60abc62b4de8b4d30645ca23a8201914ddf1e72e;hp=b58cf20ea46a62732928dcbfdeba85f23b6577c6;hpb=6e6ef69a87a73384f1032efba8a82f684961504a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debtags.pp b/modules/roles/manifests/debtags.pp
index b58cf20ea..8e350c6eb 100644
--- a/modules/roles/manifests/debtags.pp
+++ b/modules/roles/manifests/debtags.pp
@@ -1,14 +1,17 @@
 class roles::debtags {
-	apache2::module { 'ssl': }
-	package { 'libapache2-mod-wsgi': ensure => installed, }
+  include apache2
+  include apache2::ssl
 
-	ssl::service { 'debtags.debian.org':
-		notify => Service['apache2'],
-		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',
+  }
 }