diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /modules/phpbb | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'modules/phpbb')
| -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 | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/modules/phpbb/templates/config.php b/modules/phpbb/templates/config.php index a713adda..5d878235 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 0dcfec53..24747b4c 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 ea0963dd..d60e65ab 100644 --- a/modules/phpbb/templates/forums_vhost.conf +++ b/modules/phpbb/templates/forums_vhost.conf @@ -13,9 +13,9 @@ RewriteRule ^/$ /en/ [R] RewriteRule ^/(..)$ /$1/ [R] - 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 @@ -45,7 +45,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 |