aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-12-18 12:48:35 +0000
committerNicolas Vigier <boklm@mageia.org>2012-12-18 12:48:35 +0000
commitd1edfe6c78ee0c27ed04f831c7b8477dfd1e0793 (patch)
tree08a6846e0cdd0aa0ccace2f33c8e36fa22d605d7 /modules
parent290e7fbdfe205859d0c836e293f6468f1fdc115a (diff)
downloadpuppet-d1edfe6c78ee0c27ed04f831c7b8477dfd1e0793.tar
puppet-d1edfe6c78ee0c27ed04f831c7b8477dfd1e0793.tar.gz
puppet-d1edfe6c78ee0c27ed04f831c7b8477dfd1e0793.tar.bz2
puppet-d1edfe6c78ee0c27ed04f831c7b8477dfd1e0793.tar.xz
puppet-d1edfe6c78ee0c27ed04f831c7b8477dfd1e0793.zip
apache: remove "dynamic lookup" warnings
Diffstat (limited to 'modules')
-rw-r--r--modules/apache/manifests/var.pp2
-rw-r--r--modules/apache/templates/00_default_vhosts.conf2
2 files changed, 2 insertions, 2 deletions
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>