aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-09-27 21:45:41 +0000
committerNicolas Vigier <boklm@mageia.org>2012-09-27 21:45:41 +0000
commit7c6cea1344870d3eed67daba5b123906dfca284a (patch)
tree9a7be105cfd6b22245f9b693dd5045396690fed2 /modules/apache
parente57ae52fd97709e9a83d97f5513a45d6768323ac (diff)
downloadpuppet-7c6cea1344870d3eed67daba5b123906dfca284a.tar
puppet-7c6cea1344870d3eed67daba5b123906dfca284a.tar.gz
puppet-7c6cea1344870d3eed67daba5b123906dfca284a.tar.bz2
puppet-7c6cea1344870d3eed67daba5b123906dfca284a.tar.xz
puppet-7c6cea1344870d3eed67daba5b123906dfca284a.zip
don't install apache-conf on Mageia 2
Diffstat (limited to 'modules/apache')
-rw-r--r--modules/apache/manifests/base.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index e94c596b..c9bb2792 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -10,7 +10,9 @@ class apache::base {
alias => 'apache',
}
- package { 'apache-conf': }
+ if ($lsbdistrelease == '1') or ($lsbdistrelease == '2010.0') {
+ package { 'apache-conf': }
+ }
service { 'httpd':
alias => 'apache',