Merge remote-tracking branch 'origin/develop' into install_config

[friendica.git] / config / htconfig.php

diff --git a/config/htconfig.php b/config/htconfig.php
index f4ea4d295e7ce076812643aa5f2484ddabe367a5..beec41c9c0b263ca2af06bd521cdbf58cbe84f1e 100644 (file)
--- a/config/htconfig.php
+++ b/config/htconfig.php
@@ -21,6 +21,18 @@ $db_user = 'mysqlusername';
 $db_pass = 'mysqlpassword';
 $db_data = 'mysqldatabasename';
 
+// Use environment variables for mysql if they are set beforehand
+if (!empty(getenv('MYSQL_HOST'))
+   && !empty(getenv('MYSQL_PORT'))
+   && !empty(getenv('MYSQL_USERNAME'))
+   && !empty(getenv('MYSQL_PASSWORD'))
+   && !empty(getenv('MYSQL_DATABASE'))) {
+       $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
+       $db_user = getenv('MYSQL_USERNAME');
+       $db_pass = getenv('MYSQL_PASSWORD');
+       $db_data = getenv('MYSQL_DATABASE');
+}
+
 // Set the database connection charset to full Unicode (utf8mb4).
 // Changing this value will likely corrupt the special characters.
 // You have been warned.