diff options
Diffstat (limited to 'modules/apache/manifests')
-rw-r--r-- | modules/apache/manifests/base.pp | 19 | ||||
-rw-r--r-- | modules/apache/manifests/mod/fcgid.pp | 7 | ||||
-rw-r--r-- | modules/apache/manifests/var.pp | 6 |
3 files changed, 12 insertions, 20 deletions
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp index b24b740e..4e1d6ed4 100644 --- a/modules/apache/manifests/base.pp +++ b/modules/apache/manifests/base.pp @@ -1,25 +1,12 @@ class apache::base { include apache::var - # apache-mpm-prefork is merged from mga3 up - $apache_server = $lsbdistrelease ? { - /1|2/ => 'apache-mpm-prefork', - default => 'apache', - } + $conf_d = '/etc/httpd/conf/conf.d' - package { $apache_server: + package { 'apache': alias => 'apache-server', } - if versioncmp($::lsbdistrelease, '2') <= 0 { - $conf_d = '/etc/httpd/conf.d' - - # only needed on mga1 and mga2 - package { $apache::var::pkg_conf: } - } else { - $conf_d = '/etc/httpd/conf/conf.d' - } - service { 'httpd': alias => 'apache', subscribe => [ Package['apache-server'] ], @@ -40,6 +27,8 @@ class apache::base { '/etc/httpd/conf/vhosts.d/00_default_vhosts.conf': content => template('apache/00_default_vhosts.conf'), require => Package[$apache::var::pkg_conf]; + '/etc/httpd/conf/modules.d/50_mod_deflate.conf': + content => template('apache/50_mod_deflate.conf'); } file { '/etc/logrotate.d/httpd': diff --git a/modules/apache/manifests/mod/fcgid.pp b/modules/apache/manifests/mod/fcgid.pp index 6c815681..b8186a64 100644 --- a/modules/apache/manifests/mod/fcgid.pp +++ b/modules/apache/manifests/mod/fcgid.pp @@ -1,4 +1,11 @@ class apache::mod::fcgid { include apache::base package { 'apache-mod_fcgid': } + + file { 'urlescape': + path => '/usr/local/bin/urlescape', + mode => '0755', + notify => Service['apache'], + content => template('apache/urlescape'), + } } diff --git a/modules/apache/manifests/var.pp b/modules/apache/manifests/var.pp index 2c33a23f..4a6d68eb 100644 --- a/modules/apache/manifests/var.pp +++ b/modules/apache/manifests/var.pp @@ -8,9 +8,5 @@ class apache::var( $apache_group = 'apache', $default_vhost_redirect = '' ) { - if ($::lsbdistrelease == '1') or ($::lsbdistid == 'MandrivaLinux') { - $pkg_conf = 'apache-conf' - } else { - $pkg_conf = 'apache' - } + $pkg_conf = 'apache' } |