add debussy volume at ubc

[mirror/dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 19400ad..4f07934 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -97,6 +97,10 @@ class apache2 {
                source => 'puppet:///modules/apache2/headers',
        }
 
+       apache2::config { 'disabled-service':
+               source => 'puppet:///modules/apache2/disabled-service',
+       }
+
        apache2::module { 'mpm_event': ensure => absent }
        if has_role('apache_prefork') {
                apache2::module { 'mpm_worker': ensure => absent }
@@ -105,7 +109,7 @@ class apache2 {
                apache2::module { 'mpm_prefork': ensure => absent }
                apache2::module { 'mpm_worker': }
        }
-       if $::lsbmajdistrelease > '7' {
+       if versioncmp($::lsbmajdistrelease, '7') > 0 {
                file { '/etc/apache2/mods-available/mpm_worker.conf':
                        content => template('apache2/mpm_worker.erb'),
                }
@@ -132,6 +136,10 @@ class apache2 {
                content => template('apache2/disabled-index.html'),
        }
 
+       file { '/var/log/apache2':
+               ensure => directory,
+               mode   => '0755',
+       }
        file { '/var/log/apache2/.nobackup':
                mode    => '0644',
                content => '',
@@ -177,4 +185,11 @@ class apache2 {
                content => template('apache2/ssl-key-pins.erb'),
                notify  => Exec['service apache2 reload'],
        }
+
+       file { '/etc/cron.d/puppet-export-scheduled-shutdown':
+               source  => 'puppet:///modules/apache2/cron-export-scheduled-shutdown',
+       }
+       apache2::config { 'local-scheduled-shutdown':
+               source  => 'puppet:///modules/apache2/local-scheduled-shutdown',
+       }
 }