]> gitweb.fluxo.info Git - puppet-pmwiki.git/commitdiff
Fix deprecation warnings at template
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 19 Mar 2016 15:15:22 +0000 (12:15 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 19 Mar 2016 15:15:22 +0000 (12:15 -0300)
templates/pmwiki.sh.erb

index 00bb0db738eb90dd2b6286fe8a1238dd0ddca407..59c2f3a223d823ed02b8eb3ee50dfe10f79b2508 100644 (file)
@@ -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
 }