diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 12:15:22 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 12:15:22 -0300 |
| commit | a664037db90d85f3c82b39d9940874978b64a9fb (patch) | |
| tree | 6fce05d201c779d3a116ebbdaee24ca0e494dfb6 | |
| parent | becdb688306ad3eda3311e3628d42ee46a786227 (diff) | |
| download | puppet-pmwiki-a664037db90d85f3c82b39d9940874978b64a9fb.tar.gz puppet-pmwiki-a664037db90d85f3c82b39d9940874978b64a9fb.tar.bz2 | |
Fix deprecation warnings at template
| -rw-r--r-- | templates/pmwiki.sh.erb | 4 |
1 files changed, 2 insertions, 2 deletions
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 } |