From d1edfe6c78ee0c27ed04f831c7b8477dfd1e0793 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Tue, 18 Dec 2012 12:48:35 +0000
Subject: apache: remove "dynamic lookup" warnings

---
 modules/apache/manifests/var.pp                 | 2 +-
 modules/apache/templates/00_default_vhosts.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/var.pp b/modules/apache/manifests/var.pp
index 7c3ff188..294af458 100644
--- a/modules/apache/manifests/var.pp
+++ b/modules/apache/manifests/var.pp
@@ -5,7 +5,7 @@ class apache::var(
     $apache_user = 'apache',
     $apache_group = 'apache'
 ) {
-    if ($lsbdistrelease == '1') or ($lsbdistid == 'MandrivaLinux') {
+    if ($::lsbdistrelease == '1') or ($::lsbdistid == 'MandrivaLinux') {
         $pkg_conf = 'apache-conf'
     } else {
         $pkg_conf = 'apache'
diff --git a/modules/apache/templates/00_default_vhosts.conf b/modules/apache/templates/00_default_vhosts.conf
index 25f59b5e..a1afe9ca 100644
--- a/modules/apache/templates/00_default_vhosts.conf
+++ b/modules/apache/templates/00_default_vhosts.conf
@@ -3,5 +3,5 @@
 	<Location />
 		Allow from all
 	</Location>
-	Redirect / http://www.<%= domain %>/
+	Redirect / http://www.<%= @domain %>/
 </VirtualHost>
-- 
cgit v1.2.1