clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make htconfig.php fit for MariaDB

This commit is contained in:
Philipp Holzer 2018-05-26 13:31:07 +02:00
parent f54c032e87
commit bc9140affd
No known key found for this signature in database
GPG Key ID: 58160D7D6AF942B6
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htconfig.php
View File

@ -24,11 +24,15 @@ $db_data = 'mysqldatabasename';
// Use environment variables for mysql if they are set beforehand // Use environment variables for mysql if they are set beforehand
if (!empty(getenv('MYSQL_HOST')) if (!empty(getenv('MYSQL_HOST'))
&& !empty(getenv('MYSQL_PORT')) && !empty(getenv('MYSQL_PORT'))
&& !empty(getenv('MYSQL_USERNAME')) && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
&& !empty(getenv('MYSQL_PASSWORD')) && !empty(getenv('MYSQL_PASSWORD'))
&& !empty(getenv('MYSQL_DATABASE'))) { && !empty(getenv('MYSQL_DATABASE'))) {
$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'); $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
if (!empty(getenv('MYSQL_USERNAME'))) {
$db_user = getenv('MYSQL_USERNAME'); $db_user = getenv('MYSQL_USERNAME');
} elseif (!empty(getenv('MYSQL_USER'))) {
$db_user = getenv('MYSQL_USER');
}
$db_pass = getenv('MYSQL_PASSWORD'); $db_pass = getenv('MYSQL_PASSWORD');
$db_data = getenv('MYSQL_DATABASE'); $db_data = getenv('MYSQL_DATABASE');
} }

7
view/templates/htconfig.tpl
View File

@ -20,15 +20,20 @@ $db_data = '{{$dbdata}}';
// Use environment variables for mysql if they are set beforehand // Use environment variables for mysql if they are set beforehand
if (!empty(getenv('MYSQL_HOST')) if (!empty(getenv('MYSQL_HOST'))
&& !empty(getenv('MYSQL_PORT')) && !empty(getenv('MYSQL_PORT'))
&& !empty(getenv('MYSQL_USERNAME')) && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
&& !empty(getenv('MYSQL_PASSWORD')) && !empty(getenv('MYSQL_PASSWORD'))
&& !empty(getenv('MYSQL_DATABASE'))) { && !empty(getenv('MYSQL_DATABASE'))) {
$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'); $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
if (!empty(getenv('MYSQL_USERNAME'))) {
$db_user = getenv('MYSQL_USERNAME'); $db_user = getenv('MYSQL_USERNAME');
} elseif (!empty(getenv('MYSQL_USER'))) {
$db_user = getenv('MYSQL_USER');
}
$db_pass = getenv('MYSQL_PASSWORD'); $db_pass = getenv('MYSQL_PASSWORD');
$db_data = getenv('MYSQL_DATABASE'); $db_data = getenv('MYSQL_DATABASE');
} }
// Set the database connection charset to full Unicode (utf8mb4). // Set the database connection charset to full Unicode (utf8mb4).
// Changing this value will likely corrupt the special characters. // Changing this value will likely corrupt the special characters.
// You have been warned. // You have been warned.