diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-05 16:09:13 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-05 16:39:54 -0700 |
| commit | a7797c331e1fa86bdef5c49d6870d822dc591217 (patch) | |
| tree | ab13b66e6f59511f98c5973ecbff36af876b57cc /deployment | |
| parent | 9d1a749d073a5997cd435ac51c5c65eb050b2af5 (diff) | |
| download | puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.tar puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.tar.gz puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.tar.bz2 puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.tar.xz puppet-a7797c331e1fa86bdef5c49d6870d822dc591217.zip | |
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
This take leaves alone accesses of variables that are defined within the
template, which don't seem to allow an @.
This batch of changes is for templates related to web sites.
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/websites/templates/vhost_meetbot.conf | 4 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_static.conf | 4 | ||||
| -rw-r--r-- | deployment/wikis/templates/wiki_settings | 2 | ||||
| -rw-r--r-- | deployment/wikis/templates/wiki_vhost.conf | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/deployment/websites/templates/vhost_meetbot.conf b/deployment/websites/templates/vhost_meetbot.conf index a6f812c5..40a0f92a 100644 --- a/deployment/websites/templates/vhost_meetbot.conf +++ b/deployment/websites/templates/vhost_meetbot.conf @@ -1,6 +1,6 @@ <VirtualHost *:80> ServerAdmin sysadm@mageia.org - ServerName meetbot.<%= domain %> + ServerName meetbot.<%= @domain %> DocumentRoot <%= scope.lookupvar("websites::meetbot::vhostdir") %> CustomLog /var/log/httpd/access_meetbot_log combined @@ -17,7 +17,7 @@ <VirtualHost *:443> ServerAdmin sysadm@mageia.org - ServerName meetbot.<%= domain %> + ServerName meetbot.<%= @domain %> DocumentRoot <%= scope.lookupvar("websites::meetbot::vhostdir") %> CustomLog /var/log/httpd/access_meetbot_log combined diff --git a/deployment/websites/templates/vhost_static.conf b/deployment/websites/templates/vhost_static.conf index d250a712..fcadc425 100644 --- a/deployment/websites/templates/vhost_static.conf +++ b/deployment/websites/templates/vhost_static.conf @@ -1,5 +1,5 @@ <VirtualHost *:80> - ServerName static.<%= domain %> + ServerName static.<%= @domain %> DocumentRoot <%= scope.lookupvar("websites::static::vhostdir") %> CustomLog /var/log/httpd/static_log combined @@ -40,7 +40,7 @@ </VirtualHost> <VirtualHost *:443> - ServerName static.<%= domain %> + ServerName static.<%= @domain %> DocumentRoot <%= scope.lookupvar("websites::static::vhostdir") %> CustomLog /var/log/httpd/static_log combined 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..077de211 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 -%> |