diff options
| author | Dan Fandrich <danf@mageia.org> | 2026-02-21 17:42:08 -0800 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2026-02-21 20:27:09 -0800 |
| commit | 5b23841245eea3a2ba86dd0544668b5e00eb5b4b (patch) | |
| tree | c3af54f4b71b692c407594b71321f66ec67ac2d4 /modules/phpbb/templates | |
| parent | 7eb99b79075a96cb32ee2ce4bc26493d06f94387 (diff) | |
| download | puppet-5b23841245eea3a2ba86dd0544668b5e00eb5b4b.tar puppet-5b23841245eea3a2ba86dd0544668b5e00eb5b4b.tar.gz puppet-5b23841245eea3a2ba86dd0544668b5e00eb5b4b.tar.bz2 puppet-5b23841245eea3a2ba86dd0544668b5e00eb5b4b.tar.xz puppet-5b23841245eea3a2ba86dd0544668b5e00eb5b4b.zip | |
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
This is the third batch of files.
Diffstat (limited to 'modules/phpbb/templates')
| -rw-r--r-- | modules/phpbb/templates/config.php | 8 | ||||
| -rw-r--r-- | modules/phpbb/templates/forums_redirect.conf | 4 | ||||
| -rw-r--r-- | modules/phpbb/templates/forums_vhost.conf | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/modules/phpbb/templates/config.php b/modules/phpbb/templates/config.php index 5d878235..a713adda 100644 --- a/modules/phpbb/templates/config.php +++ b/modules/phpbb/templates/config.php @@ -2,11 +2,11 @@ // phpBB 3.0.x auto-generated configuration file // // Do not change anything in this file! $dbms = 'postgres'; -$dbhost = 'pg.<%= domain %>'; +$dbhost = 'pg.<%= @domain %>'; $dbport = ''; -$dbname = '<%= database %>'; -$dbuser = '<%= user %>'; -$dbpasswd = '<%= pgsql_password %>'; +$dbname = '<%= @database %>'; +$dbuser = '<%= @user %>'; +$dbpasswd = '<%= @pgsql_password %>'; $table_prefix = 'phpbb_'; $acm_type = 'apc'; $load_extensions = ''; diff --git a/modules/phpbb/templates/forums_redirect.conf b/modules/phpbb/templates/forums_redirect.conf index 24747b4c..0dcfec53 100644 --- a/modules/phpbb/templates/forums_redirect.conf +++ b/modules/phpbb/templates/forums_redirect.conf @@ -1,2 +1,2 @@ -Redirect /<%= lang %> <%= url %> -Redirect /<%= lang %>/ <%= url %> +Redirect /<%= @lang %> <%= @url %> +Redirect /<%= @lang %>/ <%= @url %> diff --git a/modules/phpbb/templates/forums_vhost.conf b/modules/phpbb/templates/forums_vhost.conf index 440dad1f..66826203 100644 --- a/modules/phpbb/templates/forums_vhost.conf +++ b/modules/phpbb/templates/forums_vhost.conf @@ -13,11 +13,11 @@ RewriteRule ^/$ /en/ [R] RewriteRule ^/(..)$ /$1/ [R] - Alias /robots.txt <%= forums_dir %>/robots.txt + Alias /robots.txt <%= @forums_dir %>/robots.txt - AliasMatch ^/(..)/(.*) <%= forums_dir %>/$1/phpBB/$2 + AliasMatch ^/(..)/(.*) <%= @forums_dir %>/$1/phpBB/$2 - <Directory ~ "<%= forums_dir %>/.*/phpBB/"> + <Directory ~ "<%= @forums_dir %>/.*/phpBB/"> <IfModule mod_authz_core.c> # Apache 2.4 Require all granted @@ -47,7 +47,7 @@ forbidden = ['install', ] for f in forbidden -%> - <Directory <%= forums_dir %>/.*/phpBB/<%= f %>/ > + <Directory <%= @forums_dir %>/.*/phpBB/<%= f %>/ > <IfModule mod_authz_core.c> # Apache 2.4 Require all denied |