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

Updated help-text 

accidentaly changed `htconfig.php` (reverted)
This commit is contained in:
Philipp Holzer 2018-05-01 13:21:42 +02:00
parent 95ef07d67b
commit 559250b8b3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htconfig.php
View File

@ -3,6 +3,9 @@
// If automatic system installation fails: // 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 // Copy or rename this file to .htconfig.php
@ -13,10 +16,10 @@
// Then set the following for your MySQL installation // Then set the following for your MySQL installation
$db_host = 'localhost'; $db_host = 'your.mysqlhost.com';
$db_user = 'friendica'; $db_user = 'mysqlusername';
$db_pass = 'friendica'; $db_pass = 'mysqlpassword';
$db_data = 'friendica'; $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'))
@ -38,15 +41,15 @@ $a->config['system']['db_charset'] = "utf8mb4";
// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". // 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. // It can be changed later and only applies to timestamps for anonymous viewers.
$default_timezone = 'Europe/Berlin'; $default_timezone = 'America/Los_Angeles';
// Default system language // Default system language
$a->config['system']['language'] = 'de'; $a->config['system']['language'] = 'en';
// What is your site name? // What is your site name?
$a->config['sitename'] = "Philipp Test"; $a->config['sitename'] = "Friendica Social Network";
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
// Be certain to create your own personal account before setting // Be certain to create your own personal account before setting

2
src/Core/Console/AutomaticInstallation.php
View File

@ -93,7 +93,7 @@ HELP;
// Copy config file // Copy config file
$this->out("Saving config file...\n"); $this->out("Saving config file...\n");
if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) { if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) {
throw new \RuntimeException("ERROR: Saving config file failed. Please copy htconfig.php to .htconfig.php manually.\n"); throw new \RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '.htconfig.php' manually.\n");
} }
$this->out(" Complete!\n\n"); $this->out(" Complete!\n\n");
$this->out("\nInstallation is finished\n"); $this->out("\nInstallation is finished\n");