Merge remote-tracking branch 'waldi/log_apache2'

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 9735570..f279cde 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -90,7 +90,11 @@ class apache2 {
        }
 
        apache2::config { 'pratchett':
-               source => 'puppet:///modules/apache2/pratchett',
+               ensure => 'absent',
+       }
+
+       apache2::config { 'headers':
+               source => 'puppet:///modules/apache2/headers',
        }
 
        apache2::module { 'mpm_event': ensure => absent }
@@ -101,7 +105,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'),
                }
@@ -128,6 +132,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 => '',