X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebtags.pp;h=263de7c4ef53d77cdac1ac0430f893f672d3efe5;hb=20ed04591aed4343ee7457336ae054bbb0343a87;hp=945ed2a84563e493cfa02feed45b0c998cb7a2cb;hpb=47ef30bef77893865ca0d1a852d5a79b02d78eee;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/debtags.pp b/modules/roles/manifests/debtags.pp index 945ed2a84..263de7c4e 100644 --- a/modules/roles/manifests/debtags.pp +++ b/modules/roles/manifests/debtags.pp @@ -1,13 +1,18 @@ class roles::debtags { - apache2::module { 'ssl': } - package { 'libapache2-mod-wsgi': ensure => installed, } + include apache2 + include apache2::ssl + include roles::sso_rp - ssl::service { 'debtags.debian.org': - notify => Service['apache2'], - } + 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', + } }