From 559250b8b3a7a5d0e524d3e3e2d347d18d6c3a2a Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 1 May 2018 13:21:42 +0200 Subject: [PATCH] Updated help-text accidentaly changed `htconfig.php` (reverted) --- htconfig.php | 17 ++++++++++------- src/Core/Console/AutomaticInstallation.php | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/htconfig.php b/htconfig.php index 5204fb6d1d..2cbbf6335d 100644 --- a/htconfig.php +++ b/htconfig.php @@ -3,6 +3,9 @@ // 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 @@ -13,10 +16,10 @@ // Then set the following for your MySQL installation -$db_host = 'localhost'; -$db_user = 'friendica'; -$db_pass = 'friendica'; -$db_data = 'friendica'; +$db_host = 'your.mysqlhost.com'; +$db_user = 'mysqlusername'; +$db_pass = 'mysqlpassword'; +$db_data = 'mysqldatabasename'; // Use environment variables for mysql if they are set beforehand 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". // 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 -$a->config['system']['language'] = 'de'; +$a->config['system']['language'] = 'en'; // 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. // Be certain to create your own personal account before setting diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php index d00e291e5b..189bb9d19e 100644 --- a/src/Core/Console/AutomaticInstallation.php +++ b/src/Core/Console/AutomaticInstallation.php @@ -93,7 +93,7 @@ HELP; // Copy config file $this->out("Saving config file...\n"); 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("\nInstallation is finished\n");