Fixed vanilla forums server config to use environment variables

spira · Dec 18, 2015 · 6de2c03 · 6de2c03
1 parent 0c94410
commit 6de2c03
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/docker/.local.env b/docker/.local.env
@@ -23,12 +23,18 @@ POSTGRES_USER=spira
 # VANILLA_SERVER_HOST is not defined, to fall back on getting docker variable
 VANILLA_SERVER_PORT=80
 
-# vanilla forums database
+# vanilla forums database (for docker config)
 MYSQL_ROOT_PASSWORD=root
 MYSQL_USER=spira_vanilla
 MYSQL_PASSWORD=spira_vanilla
 MYSQL_DATABASE=spira_vanilla
 
+# vanilla forums database (for vanilla config)
+FORUM_DB_DATABASE=spira_vanilla
+FORUM_DB_HOST=vanilladatabase
+FORUM_DB_USERNAME=spira_vanilla
+FORUM_DB_PASSWORD=spira_vanilla
+
 # vanilla forums jsConnect keys
 VANILLA_JSCONNECT_CLIENT_ID=a-client-id-random-string
 VANILLA_JSCONNECT_SECRET=a-secret-phrase-random-string
diff --git a/docker/.qa.env b/docker/.qa.env
@@ -17,12 +17,18 @@ POSTGRES_USER=spira_qa
 # VANILLA_SERVER_HOST is not defined, to fall back on getting docker variable
 VANILLA_SERVER_PORT=80
 
-# vanilla forums database
+# vanilla forums database (for docker config)
 MYSQL_ROOT_PASSWORD=root_qa
 MYSQL_USER=spira_vanilla_qa
 MYSQL_PASSWORD=spira_vanilla_qa
 MYSQL_DATABASE=spira_vanilla_qa
 
+# vanilla forums database (for vanilla config)
+FORUM_DB_DATABASE=spira_vanilla_qa
+FORUM_DB_HOST=vanilladatabase
+FORUM_DB_USERNAME=spira_vanilla_qa
+FORUM_DB_PASSWORD=spira_vanilla_qa
+
 # vanilla forums jsConnect keys
 VANILLA_JSCONNECT_CLIENT_ID=a-client-id-random-string
 VANILLA_JSCONNECT_SECRET=a-secret-phrase-random-string
diff --git a/forum/bootstrap.database.php b/forum/bootstrap.database.php
@@ -11,7 +11,7 @@
 $databaseConfig = [
     'Database.Name' => getenv('FORUM_DB_DATABASE'),
     'Database.Host' => getenv('FORUM_DB_HOST'),
-    'Database.User' => getenv('FORUM_DB_USER'),
+    'Database.User' => getenv('FORUM_DB_USERNAME'),
     'Database.Password' => getenv('FORUM_DB_PASSWORD'),
 ];