Continued a bit:

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 5204fb6d1de6f0876a4b0886771e18378f2e441d..0e838bd90d6e28a1d0e8ed87b719633e3b1d28d2 100644 (file)
--- 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,19 +16,23 @@
 
 // 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'))
        && !empty(getenv('MYSQL_PORT'))
-       && !empty(getenv('MYSQL_USERNAME'))
+       && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
        && !empty(getenv('MYSQL_PASSWORD'))
        && !empty(getenv('MYSQL_DATABASE'))) {
        $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-       $db_user = getenv('MYSQL_USERNAME');
+       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');
 }
@@ -38,15 +45,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