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 f9771c88da79438fadc17aac3cd142632f09c645..dc2d4bcdabcb67f4774d824e926dc020317c0ee5 100644 (file)
--- 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.
@@ -78,15 +95,14 @@ $a->config['max_import_size'] = 200000;
 $a->config['system']['maximagesize'] = 800000;
 
 // Server-to-server private message encryption (RINO) is allowed by default.
-// Encryption will only be provided if this setting is set to a non zero value
-// set to 0 to disable, 2 to enable, 1 is deprecated
+// set to 0 to disable, 1 to enable
 
 $a->config['system']['rino_encrypt'] = {{$rino}};
 
 // default system theme
 
 $a->config['system']['theme'] = 'vier';
-$a->config['system']['allowed_themes'] = 'vier,quattro,duepuntozero,smoothly';
+$a->config['system']['allowed_themes'] = 'vier,quattro,duepuntozero,smoothly,frio';
 
 // By default allow pseudonyms
 
@@ -96,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;