From 0b903e5f64f283231449a48ca8b9725ec6d8245b Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Mon, 10 Dec 2012 19:54:47 +0000
Subject: Create apache::var and move apache config options

Move apache options to apache::var class
---
 modules/apache/manifests/base.pp   | 7 +------
 modules/apache/manifests/var.pp    | 7 +++++++
 modules/apache/templates/logrotate | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 modules/apache/manifests/var.pp

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/base.pp b/modules/apache/manifests/base.pp
index 1af8c256..2232e78e 100644
--- a/modules/apache/manifests/base.pp
+++ b/modules/apache/manifests/base.pp
@@ -1,10 +1,5 @@
 class apache::base {
-
-    # number of time the log file are rotated before being removed
-    $httpdlogs_rotate = '24'
-
-    $apache_user = 'apache'
-    $apache_group = 'apache'
+    include apache::var
 
     package { 'apache-mpm-prefork': }
 
diff --git a/modules/apache/manifests/var.pp b/modules/apache/manifests/var.pp
new file mode 100644
index 00000000..636b9bc5
--- /dev/null
+++ b/modules/apache/manifests/var.pp
@@ -0,0 +1,7 @@
+# $httpdlogs_rotate:
+#   number of time the log file are rotated before being removed
+class apache::var(
+    $httpdlogs_rotate = '24',
+    $apache_user = 'apache',
+    $apache_group = 'apache'
+) {}
diff --git a/modules/apache/templates/logrotate b/modules/apache/templates/logrotate
index f84ae9fe..b144b2a2 100644
--- a/modules/apache/templates/logrotate
+++ b/modules/apache/templates/logrotate
@@ -1,5 +1,5 @@
 /var/log/httpd/*_log /var/log/httpd/apache_runtime_status /var/log/httpd/ssl_mutex {
-    rotate <%= httpdlogs_rotate %>
+    rotate <%= scope.lookupvar('apache::var::httpdlogs_rotate') %>
     monthly
     missingok
     notifempty
-- 
cgit v1.2.1