diff options
| author | Olivier Blin <dev@blino.org> | 2015-11-22 02:09:53 +0100 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2015-11-30 01:32:43 +0100 |
| commit | 4ad008a4880c770205d0ee9afdf6c522c284788a (patch) | |
| tree | 1e0a3cde37b3d497f722e2a7d3fe550fd9ca07be /modules/apache/manifests/base.pp | |
| parent | 396da52d807c0e1d110ba60ba093d27c70234630 (diff) | |
| download | puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.tar puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.tar.gz puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.tar.bz2 puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.tar.xz puppet-4ad008a4880c770205d0ee9afdf6c522c284788a.zip | |
apache: use proper conf.d dir on Mageia >= 2
Diffstat (limited to 'modules/apache/manifests/base.pp')
| -rw-r--r-- | modules/apache/manifests/base.pp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp index 18c9a8bf..d56e9100 100644 --- a/modules/apache/manifests/base.pp +++ b/modules/apache/manifests/base.pp @@ -11,9 +11,13 @@ class apache::base { alias => 'apache-server', } - # only needed on mga1 and mga2 - if ($::lsbdistrelease == '1') or ($::lsbdistrelease == '2') { + 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': @@ -27,7 +31,7 @@ class apache::base { } apache::config { - '/etc/httpd/conf.d/customization.conf': + "${conf_d}/customization.conf": content => template('apache/customization.conf'), require => Package[$apache::var::pkg_conf]; '/etc/httpd/conf/vhosts.d/00_default_vhosts.conf': |