diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2012-12-10 19:54:49 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2012-12-10 19:54:49 +0000 |
| commit | 2c96b3c238b35d09a297f540b2c22650ccd01e31 (patch) | |
| tree | e4d9dc74ff2b1df4598712e6f1aaff561926b953 /modules/apache | |
| parent | 0b903e5f64f283231449a48ca8b9725ec6d8245b (diff) | |
| download | puppet-2c96b3c238b35d09a297f540b2c22650ccd01e31.tar puppet-2c96b3c238b35d09a297f540b2c22650ccd01e31.tar.gz puppet-2c96b3c238b35d09a297f540b2c22650ccd01e31.tar.bz2 puppet-2c96b3c238b35d09a297f540b2c22650ccd01e31.tar.xz puppet-2c96b3c238b35d09a297f540b2c22650ccd01e31.zip | |
apache: use variable to store apache config package
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/base.pp | 6 | ||||
| -rw-r--r-- | modules/apache/manifests/var.pp | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp index 2232e78e..a986d50a 100644 --- a/modules/apache/manifests/base.pp +++ b/modules/apache/manifests/base.pp @@ -3,11 +3,7 @@ class apache::base { package { 'apache-mpm-prefork': } - if ($lsbdistrelease == '1') or ($lsbdistid == 'MandrivaLinux') { - package { 'apache-conf': } - } else { - package { 'apache': } - } + package { $apache::var::pkg_conf: } service { 'httpd': alias => 'apache', diff --git a/modules/apache/manifests/var.pp b/modules/apache/manifests/var.pp index 636b9bc5..7c3ff188 100644 --- a/modules/apache/manifests/var.pp +++ b/modules/apache/manifests/var.pp @@ -4,4 +4,10 @@ class apache::var( $httpdlogs_rotate = '24', $apache_user = 'apache', $apache_group = 'apache' -) {} +) { + if ($lsbdistrelease == '1') or ($lsbdistid == 'MandrivaLinux') { + $pkg_conf = 'apache-conf' + } else { + $pkg_conf = 'apache' + } +} |