1
0
Fork 0

Merge pull request #3141 from tobiasd/20170201-htconfig

make sure all config done with the installer is represented in the emergency backup template as well
This commit is contained in:
Michael Vogel 2017-02-02 09:40:05 +01:00 committed by GitHub
commit 2c71d307c8
2 changed files with 15 additions and 3 deletions

View file

@ -26,6 +26,10 @@ $a->config['system']['db_charset'] = "utf8mb4";
$default_timezone = 'America/Los_Angeles'; $default_timezone = 'America/Los_Angeles';
// Default system language
$a->config['system']['language'] = 'en';
// What is your site name? // What is your site name?
$a->config['sitename'] = "Friendica Social Network"; $a->config['sitename'] = "Friendica Social Network";
@ -60,9 +64,16 @@ $a->config['php_path'] = 'php';
$a->config['system']['huburl'] = '[internal]'; $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
$a->config['system']['rino_encrypt'] = 2;
// allowed themes (change this from admin panel after installation) // 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 // default system theme

View file

@ -80,8 +80,9 @@ $a->config['system']['maximagesize'] = 800000;
$a->config['system']['huburl'] = '[internal]'; $a->config['system']['huburl'] = '[internal]';
// Server-to-server private message encryption (RINO) is allowed by default. // Server-to-server private message encryption (RINO) is allowed by default.
// Encryption will only be provided if this setting is true and the // Encryption will only be provided if this setting is set to a non zero
// PHP mcrypt extension is installed on both systems // 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
$a->config['system']['rino_encrypt'] = {{$rino}}; $a->config['system']['rino_encrypt'] = {{$rino}};