tobias/friendica
1
0
Fork 0
Code Pull requests Activity

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

Browse source
This commit is contained in:
Philipp Holzer 2018-04-21 14:23:49 +02:00
commit 334d392154
90 changed files with 59497 additions and 56448 deletions
Download patch file Download diff file Expand all files Collapse all files

12
config/htconfig.php
View file

@ -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.