X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=view%2Ftemplates%2Fhtconfig.tpl;h=dc2d4bcdabcb67f4774d824e926dc020317c0ee5;hb=e3584daef9c7801bce8d504152c5ccbd3ab492b4;hp=f651a273f73ec8c7fd7a5bcc4ec39da2b3e407f1;hpb=e970bbdca82f1ae0aad82a04892fdc3547dfb2cf;p=friendica.git

diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index f651a273f7..dc2d4bcdab 100644
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -17,6 +17,23 @@ $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 
+// 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');
+	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.
@@ -95,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;