aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2014-04-27 12:05:51 +0000
committerThomas Backlund <tmb@mageia.org>2014-04-27 12:05:51 +0000
commit6c0645888f27dd95fb830eace8913187d24dc174 (patch)
tree48c652190f2e38fbd3f54ad8de7a3737c13049d5 /modules
parent44c6a307c3ceb5e1f1569e891f95c9bebdc1a801 (diff)
downloadpuppet-6c0645888f27dd95fb830eace8913187d24dc174.tar
puppet-6c0645888f27dd95fb830eace8913187d24dc174.tar.gz
puppet-6c0645888f27dd95fb830eace8913187d24dc174.tar.bz2
puppet-6c0645888f27dd95fb830eace8913187d24dc174.tar.xz
puppet-6c0645888f27dd95fb830eace8913187d24dc174.zip
disable duplicate apache package requests
Diffstat (limited to 'modules')
-rw-r--r--modules/apache/manifests/base.pp7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index 9b767231..f72e4aca 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -11,8 +11,11 @@ class apache::base {
alias => 'apache-server',
}
- package { $apache::var::pkg_conf: }
-
+ # only needed on mga1 and mga2
+ if ($::lsbdistrelease == '1') or ($::lsbdistrelease == '2') {
+ package { $apache::var::pkg_conf: }
+ }
+
service { 'httpd':
alias => 'apache',
subscribe => [ Package['apache-server'] ],