sizeof bug

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index fe6c0d82ee4562275a88beb8b301870b5c0b4543..2cbbf6335dcc55113ff40798ab2960eafcc53a93 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,11 +21,32 @@ $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.
+$a->config['system']['db_charset'] = "utf8mb4";
+
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
 // It can be changed later and only applies to timestamps for anonymous viewers.
 
 $default_timezone = 'America/Los_Angeles';
 
+// Default system language
+
+$a->config['system']['language'] = 'en';
+
 // What is your site name?
 
 $a->config['sitename'] = "Friendica Social Network";
@@ -51,17 +77,18 @@ $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
+// Server-to-server private message encryption (RINO) is allowed by default.
+// set to 0 to disable, 1 to enable
 
-$a->config['system']['huburl'] = '[internal]';
+$a->config['system']['rino_encrypt'] = 1;
 
 // allowed themes (change this from admin panel after installation)
 
-$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero';
+$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly';
 
 // default system theme
 
-$a->config['system']['theme'] = 'duepuntozero';
+$a->config['system']['theme'] = 'vier';
 
 
 // By default allow pseudonyms
@@ -72,4 +99,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'] = ['ftp', 'ftps', 'mailto', 'cid', 'gopher'];
+
+// Authentication cookie lifetime, in days
+$a->config['system']['auth_cookie_lifetime'] = 7;