From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 19 Mar 2016 15:15:22 +0000 (-0300)
Subject: Fix deprecation warnings at template
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a664037db90d85f3c82b39d9940874978b64a9fb;p=puppet-pmwiki.git

Fix deprecation warnings at template
---

diff --git a/templates/pmwiki.sh.erb b/templates/pmwiki.sh.erb
index 00bb0db..59c2f3a 100644
--- a/templates/pmwiki.sh.erb
+++ b/templates/pmwiki.sh.erb
@@ -139,7 +139,7 @@ function pmwiki_install {
   cat > $SITES/$site/wiki/.htaccess <<-EOF
 Options +FollowSymLinks
 RewriteEngine on
-RewriteRule ^/?$ https://$site.<%= domain %>/Main/HomePage [R=permanent,QSA,L]
+RewriteRule ^/?$ https://$site.<%= scope.lookupvar('::domain') %>/Main/HomePage [R=permanent,QSA,L]
 RewriteRule ^([^/a-z].*) field.php?n=\$1 [QSA,L]
 EOF
 
@@ -147,7 +147,7 @@ EOF
   cat > $SITES/$site/wiki/local/config.php <<-EOF
 <?php if (!defined('PmWiki')) exit();
 
-\$ScriptUrl = "https://$site.<%= domain %>";
+\$ScriptUrl = "https://$site.<%= scope.lookupvar('::domain') %>";
 \$EnablePathInfo = 1;
 EOF
 }