Merge pull request #5065 from tobiasd/2018.05-rc

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 1b6745938c9aa161ec2533bb4f8950b04bd73126..2cbbf6335dcc55113ff40798ab2960eafcc53a93 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -3,7 +3,7 @@
 // If automatic system installation fails:
 
 
-die('The configuration done manually contains some mistakes. Please have a look at your .htconfig.php file.');
+die('The configuration you did manually contains some mistakes. Please have a look at your .htconfig.php file.');
 // If you are doing the configuration manually, please remove the line above
 
 
@@ -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.