Merge pull request #5167 from VVelox/develop

[friendica.git] / view / templates / htconfig.tpl

diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 0b81b77326b05eef1dcb5b97a20510a701938b3c..dc2d4bcdabcb67f4774d824e926dc020317c0ee5 100644 (file)
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -17,15 +17,23 @@ $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 
-// Set this variable to true, if you want to use environment variables for mysql
-$db_use_env_vars = false;
-if ($db_use_env_vars === true) {
+// 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_USER')))
+       && !empty(getenv('MYSQL_PASSWORD'))
+       && !empty(getenv('MYSQL_DATABASE'))) {
        $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-       $db_user = getenv('MYSQL_USERNAME');
+       if (!empty(getenv('MYSQL_USERNAME'))) {
+               $db_user = getenv('MYSQL_USERNAME');
+       } elseif (!empty(getenv('MYSQL_USER'))) {
+               $db_user = getenv('MYSQL_USER');
+       }
        $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.
@@ -104,7 +112,7 @@ $a->config['system']['no_regfullname'] = true;
 //$a->config['system']['block_local_dir'] = false;
 
 // Location of the global directory
-$a->config['system']['directory'] = 'http://dir.friendica.social';
+$a->config['system']['directory'] = 'https://dir.friendica.social';
 
 // Authentication cookie lifetime, in days
 $a->config['system']['auth_cookie_lifetime'] = 7;