diff options
| author | Thomas Backlund <tmb@mageia.org> | 2014-04-27 10:47:31 +0000 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2014-04-27 10:47:31 +0000 |
| commit | 665c450f7113daa54cb02b229a4a71faba73cd5a (patch) | |
| tree | 9b81768fa3b3a32401310f58c2c7ace842f25c8d /modules/apache | |
| parent | cd16d8d5e70739934be4820d967ec71dfe99b2fb (diff) | |
| download | puppet-665c450f7113daa54cb02b229a4a71faba73cd5a.tar puppet-665c450f7113daa54cb02b229a4a71faba73cd5a.tar.gz puppet-665c450f7113daa54cb02b229a4a71faba73cd5a.tar.bz2 puppet-665c450f7113daa54cb02b229a4a71faba73cd5a.tar.xz puppet-665c450f7113daa54cb02b229a4a71faba73cd5a.zip | |
handle new apache name from mga3 up
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/base.pp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp index 92f55c40..a4c2ac2c 100644 --- a/modules/apache/manifests/base.pp +++ b/modules/apache/manifests/base.pp @@ -1,13 +1,21 @@ class apache::base { include apache::var - package { 'apache-mpm-prefork': } + # apache-mpm-prefork is merged from mga3 up + $apache_server = $lsbdistrelease ? { + /1|2/ => 'apache-mpm-prefork', + default => 'apache', + } + + package { '$apache_server': + alias 'apache-server' + } package { $apache::var::pkg_conf: } service { 'httpd': alias => 'apache', - subscribe => [ Package['apache-mpm-prefork'] ], + subscribe => [ Package['apache-server'] ], } exec { 'service httpd configtest': |