Browse Source

Fix variable access warnings

Change-Id: If5d0b9945c90d00967414d9dd745ce8dbeb6f3b6
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Paul Belanger 3 years ago
parent
commit
b802d5f4a0
4 changed files with 17 additions and 17 deletions
  1. 11
    11
      templates/database.php.erb
  2. 1
    1
      templates/environment.php.erb
  3. 2
    2
      templates/log.php.erb
  4. 3
    3
      templates/recaptcha.php.erb

+ 11
- 11
templates/database.php.erb View File

@@ -41,10 +41,10 @@ return array(
41 41
      //primary DB
42 42
      'openstackid' => array(
43 43
      'driver'    => 'mysql',
44
-     'host'      => '<%= id_mysql_host %>',
45
-     'database'  => '<%= id_db_name %>',
46
-     'username'  => '<%= id_mysql_user %>',
47
-     'password'  => '<%= id_mysql_password %>',
44
+     'host'      => '<%= @id_mysql_host %>',
45
+     'database'  => '<%= @id_db_name %>',
46
+     'username'  => '<%= @id_mysql_user %>',
47
+     'password'  => '<%= @id_mysql_password %>',
48 48
      'charset'   => 'utf8',
49 49
      'collation' => 'utf8_unicode_ci',
50 50
      'prefix'    => '',
@@ -52,10 +52,10 @@ return array(
52 52
      //secondary DB (OS Membership)
53 53
      'os_members' => array(
54 54
      'driver'    => 'mysql',
55
-     'host'      => '<%= ss_mysql_host %>',
56
-     'database'  => '<%= ss_db_name %>',
57
-     'username'  => '<%= ss_mysql_user %>',
58
-     'password'  => '<%= ss_mysql_password %>',
55
+     'host'      => '<%= @ss_mysql_host %>',
56
+     'database'  => '<%= @ss_db_name %>',
57
+     'username'  => '<%= @ss_mysql_user %>',
58
+     'password'  => '<%= @ss_mysql_password %>',
59 59
      'charset'   => 'utf8',
60 60
      'collation' => 'utf8_unicode_ci',
61 61
      'prefix'    => '',
@@ -85,10 +85,10 @@ return array(
85 85
   'redis' => array(
86 86
      'cluster' => false,
87 87
      'default' => array(
88
-     'host' => '<%= redis_host %>',
89
-     'port' => <%= redis_port %>,
88
+     'host' => '<%= @redis_host %>',
89
+     'port' => <%= @redis_port %>,
90 90
      'database' => 0,
91
-     'password' => '<%= redis_password %>'
91
+     'password' => '<%= @redis_password %>'
92 92
     ),
93 93
   ),
94 94
 );

+ 1
- 1
templates/environment.php.erb View File

@@ -1,6 +1,6 @@
1 1
 <?php
2 2
 
3 3
 $env = $app->detectEnvironment(array(
4
-  '<%= id_environment %>' => array('<%= id_hostname %>')
4
+  '<%= @id_environment %>' => array('<%= @id_hostname %>')
5 5
 ));
6 6
 

+ 2
- 2
templates/log.php.erb View File

@@ -4,7 +4,7 @@ return array(
4 4
   * EMAIL ERROR LOG CONFIGURATION
5 5
   */
6 6
   //The receiver of the mail
7
-  'to_email'   => '<%= id_log_error_to_email %>',
7
+  'to_email'   => '<%= @id_log_error_to_email %>',
8 8
   //The sender of the mail
9
-  'from_email' => '<%= id_log_error_from_email %>'
9
+  'from_email' => '<%= @id_log_error_from_email %>'
10 10
 );

+ 3
- 3
templates/recaptcha.php.erb View File

@@ -8,8 +8,8 @@ return array(
8 8
   | Set the public and private API keys as provided by reCAPTCHA.
9 9
   |
10 10
   */
11
-  'public_key'  => '<%= id_recaptcha_public_key %>',
12
-  'private_key' => '<%= id_recaptcha_private_key %>',
11
+  'public_key'  => '<%= @id_recaptcha_public_key %>',
12
+  'private_key' => '<%= @id_recaptcha_private_key %>',
13 13
   /*
14 14
   |--------------------------------------------------------------------------
15 15
   | Template
@@ -18,5 +18,5 @@ return array(
18 18
   | Set a template to use if you don't want to use the standard one.
19 19
   |
20 20
   */
21
-  'template' => '<%= id_recaptcha_template %>'
21
+  'template' => '<%= @id_recaptcha_template %>'
22 22
 );

Loading…
Cancel
Save