Merge pull request #6326 from annando/dont-show-follow

[friendica.git] / INSTALL.txt

diff --git a/INSTALL.txt b/INSTALL.txt
index 705eb8fed2fe90a6f944b615394044b90d944bbe..9d10e8aee6b1df6d61db73fc8c684fa46bbbbd34 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -56,6 +56,13 @@ you wish to communicate with the Diaspora network.
        - For alternative server configurations (such as Nginx server and MariaDB
        database engine), refer to the wiki at https://github.com/friendica/friendica/wiki
 
+This guide will walk you through the manual installation process of Friendica.
+If this is nothing for you, you might be interested in
+
+* the Friendica Docker image (https://github.com/friendica/docker) or
+* how install Friendica with YunoHost (https://github.com/YunoHost-Apps/friendica_ynh).
+
+
 2. Unpack the Friendica files into the root of your web server document area.
 
        - If you copy the directory tree to your webserver, make sure
@@ -107,7 +114,7 @@ password, database name).
 
 4. If you know in advance that it will be impossible for the web server to
 write or create files in the config/ subfolder, create an empty file called
-local.ini.php and make it writable by the web server.
+local.config.php and make it writable by the web server.
 
 5. Visit your website with a web browser and follow the instructions. Please
 note any error messages and correct these before continuing.
@@ -121,9 +128,9 @@ so in the host name setting for the database.
 
 6. *If* the automated installation fails for any reason, check the following:
 
-       - "config/local.ini.php" exists
-               If not, edit local-sample.ini.php and change system settings. Rename
-to local.ini.php
+       - "config/local.config.php" exists
+               If not, edit local-sample.config.php and change system settings. Rename
+to local.config.php
        -  Database is populated.
                If not, import the contents of "database.sql" with phpmyadmin
 or mysql command line
@@ -132,7 +139,7 @@ or mysql command line
 Registration errors should all be recoverable automatically.
 If you get any *critical* failure at this point, it generally indicates the
 database was not installed correctly. You might wish to move/rename
-local.ini.php to another name and empty (called 'dropping') the database
+local.config.php to another name and empty (called 'dropping') the database
 tables, so that you can start fresh.
 
 ****************************************************************************
@@ -177,7 +184,7 @@ Bad things will happen. Let there be a hardware failure, a corrupted
 database or whatever you can think of. So once the installation of your
 Friendica node is done, you should make yoursef a backup plan.
 
-The most important file is the `config/local.ini.php` file in the base directory.
+The most important file is the `config/local.config.php` file in the base directory.
 As it stores all your data, you should also have a recent dump of your
 Friendica database at hand, should you have to recover your node.
 
@@ -274,21 +281,21 @@ Windows).
 
 
 #####################################################################
-- If you are unable to write the file config/local.ini.php during installation
+- If you are unable to write the file config/local.config.php during installation
 due to permissions issues:
 #####################################################################
 
        create an empty file with that name and give it world-write permission.
 For Linux:
 
-% touch config/local.ini.php
-% chmod 664 config/local.ini.php
+% touch config/local.config.php
+% chmod 664 config/local.config.php
 
 Retry the installation. As soon as the database has been created,
 
 ******* this is important *********
 
-% chmod 644 config/local.ini.php
+% chmod 644 config/local.config.php
 
 #####################################################################
 - Some configurations with "suhosin" security are configured without
@@ -327,11 +334,12 @@ After a while I noticed, that bin/worker.php calls further php script via
 proc_open. These scripts themselves also use proc_open and fail, because they
 are NOT called with -d suhosin.executor.func.blacklist=none.
 
-So the simple solution is to put the correct parameters into config/local.ini.php:
+So the simple solution is to put the correct parameters into config/local.config.php:
 
-[config]
-; Location of PHP command line processor
-php_path = "/usr/bin/php -d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none"
+       'config' => [
+               //Location of PHP command line processor
+               'php_path' => '/usr/bin/php -d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none',
+       ],
 
 This is obvious as soon as you notice that the friendica-cron uses proc_open to
 execute php-scripts that also use proc_open, but it took me quite some time to