diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 19:28:06 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 19:28:06 -0700 |
| commit | 2c7da66570999dcd21f11f976dc6ec27d820f45c (patch) | |
| tree | b97dd9f25df691c66b2be31b658cc6fec638d47e /deployment/wikis | |
| parent | a69863ece1973cf3eae488f30c657b57dfb89779 (diff) | |
| download | puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.gz puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.bz2 puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.tar.xz puppet-2c7da66570999dcd21f11f976dc6ec27d820f45c.zip | |
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
Diffstat (limited to 'deployment/wikis')
| -rw-r--r-- | deployment/wikis/templates/wiki_settings | 2 | ||||
| -rw-r--r-- | deployment/wikis/templates/wiki_vhost.conf | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/deployment/wikis/templates/wiki_settings b/deployment/wikis/templates/wiki_settings index 16d9245d..ec6e647d 100644 --- a/deployment/wikis/templates/wiki_settings +++ b/deployment/wikis/templates/wiki_settings @@ -13,7 +13,7 @@ $wgScriptPath = "/mw-$wgLanguageCode"; $wgArticlePath = "/$wgLanguageCode/$1"; $wgUsePathInfo = true; $wgStylePath = "$wgScriptPath/skins"; -$wgStyleDirectory = '<%= wikis_templates %>/skins'; +$wgStyleDirectory = '<%= @wikis_templates %>/skins'; $wgLogo = ""; $wgDefaultSkin = 'vector'; $wgFavicon = '/mw-en/skins/cavendish/favicon.png'; diff --git a/deployment/wikis/templates/wiki_vhost.conf b/deployment/wikis/templates/wiki_vhost.conf index d4e5e0a2..2e0a1c95 100644 --- a/deployment/wikis/templates/wiki_vhost.conf +++ b/deployment/wikis/templates/wiki_vhost.conf @@ -1,4 +1,4 @@ -<Directory <%= wikis_root %>> +<Directory <%= @wikis_root %>> Options +FollowSymLinks </Directory> @@ -7,11 +7,11 @@ RewriteRule ^/?$ /en/ [R] <%- for lang in wiki_languages -%> -<Directory <%= wikis_root %>/<%= lang %>/images> +<Directory <%= @wikis_root %>/<%= @lang %>/images> SetHandler default-handler </Directory> -Alias /<%= lang %> <%= wikis_root %>/<%= lang %>/index.php -Alias /mw-<%= lang %> <%= wikis_root %>/<%= lang %> +Alias /<%= @lang %> <%= @wikis_root %>/<%= @lang %>/index.php +Alias /mw-<%= @lang %> <%= @wikis_root %>/<%= @lang %> <%- end -%> |