try it as a class

diff --git a/modules/apache2/manifests/ssl.pp b/modules/apache2/manifests/ssl.pp
new file mode 100644 (file)
index 0000000..4bf9d4c
--- /dev/null
+++ b/modules/apache2/manifests/ssl.pp
@@ -0,0 +1,3 @@
+class apache2::ssl {
+       apache2::module { 'ssl': }
+}

diff --git a/modules/roles/manifests/debtags.pp b/modules/roles/manifests/debtags.pp
index b58cf20..5032809 100644 (file)
--- a/modules/roles/manifests/debtags.pp
+++ b/modules/roles/manifests/debtags.pp
@@ -1,5 +1,5 @@
 class roles::debtags {
-       apache2::module { 'ssl': }
+       include apache2::ssl
        package { 'libapache2-mod-wsgi': ensure => installed, }
 
        ssl::service { 'debtags.debian.org':

diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index afbca19..1264e8b 100644 (file)
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,5 +1,5 @@
 class roles::jenkins {
-       apache2::module { 'ssl': }
+       include apache2::ssl
        apache2::module { 'proxy_http': }
 
        apache2::site { '010-jenkins.debian.org':

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 9faab44..fea2e35 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -6,8 +6,8 @@ class roles::static_mirror {
        package { 'libapache2-mod-geoip': ensure => installed, }
        package { 'geoip-database': ensure => installed, }
 
+       include apache2::ssl
        apache2::module { 'include': }
-       apache2::module { 'ssl': }
        apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
        file { '/usr/local/bin/static-mirror-run':

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index b01232b..eefb8dc 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -41,6 +41,7 @@ class roles::syncproxy {
        }
 
        if $::apache2 and $syncproxy_name != 'unknown' {
+               include apache2::ssl
                ssl::service { "$syncproxy_name": notify => Service['apache2'], key => true, }
                apache2::site { '010-syncproxy.debian.org':
                        site   => 'syncproxy.debian.org',