Continued a bit:

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 41317c46083034c47987194fdf7dce741a1088b8..0e838bd90d6e28a1d0e8ed87b719633e3b1d28d2 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -2,6 +2,11 @@
 
 // If automatic system installation fails:
 
+
+die('The configuration you did manually contains some mistakes. Please have a look at your .htconfig.php file.');
+// If you are doing the configuration manually, please remove the line above
+
+
 // Copy or rename this file to .htconfig.php
 
 // Why .htconfig.php? Because it contains sensitive information which could
@@ -16,7 +21,23 @@ $db_user = 'mysqlusername';
 $db_pass = 'mysqlpassword';
 $db_data = 'mysqldatabasename';
 
-// Set the database connection charset to UTF8.
+// 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.
 $a->config['system']['db_charset'] = "utf8mb4";
@@ -60,16 +81,10 @@ $a->config['system']['maximagesize'] = 800000;
 
 $a->config['php_path'] = 'php';
 
-// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
-
-$a->config['system']['huburl'] = '[internal]';
-
 // 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 and the PHP mcrypt extension is installed on both systems
-// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt
+// set to 0 to disable, 1 to enable
 
-$a->config['system']['rino_encrypt'] = 2;
+$a->config['system']['rino_encrypt'] = 1;
 
 // allowed themes (change this from admin panel after installation)
 
@@ -88,7 +103,10 @@ $a->config['system']['no_regfullname'] = true;
 //$a->config['system']['block_local_dir'] = false;
 
 // Location of the global directory
-$a->config['system']['directory'] = 'http://dir.friendi.ca';
+$a->config['system']['directory'] = 'https://dir.friendica.social';
 
 // Allowed protocols in link URLs; HTTP protocols always are accepted
-$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');
+$a->config['system']['allowed_link_protocols'] = ['ftp', 'ftps', 'mailto', 'cid', 'gopher'];
+
+// Authentication cookie lifetime, in days
+$a->config['system']['auth_cookie_lifetime'] = 7;