Merge pull request #2683 from tobiasd/20160721-demessages

[friendica.git] / INSTALL.txt

diff --git a/INSTALL.txt b/INSTALL.txt
index 86076a09ae6f63f9e21aba94b90e91ac814a286f..08bd41c8d3903bd564d2086f5960fafd00916331 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -51,6 +51,10 @@ php.ini file [or see 'poormancron' in section 8]
 directory/path component in the URL) is preferred. This is REQUIRED if
 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
+
 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
@@ -60,6 +64,8 @@ you wish to communicate with the Diaspora network.
 3. Create an empty database and note the access details (hostname, username, 
 password, database name).
 
+    - Friendica needs the permission to create and delete fields and tables in its own database.
+
 
 4. If you know in advance that it will be impossible for the web server to 
 write or create files in your web directory, create an empty file called 
@@ -130,8 +136,25 @@ $a->config['system']['addon'] = 'js_upload,poormancron';
 
 and save your changes.
 
+9. (Optional) Reverse-proxying and HTTPS
+
+Friendica looks for some well-known HTTP headers indicating a reverse-proxy
+terminating an HTTPS connection. While the standard from RFC 7239 specifies
+the use of the `Forwaded` header.
+
+    Forwarded: for=192.0.2.1; proto=https; by=192.0.2.2
+
+Friendica also supports a number on non-standard headers in common use.
+
+
+    X-Forwarded-Proto: https
+
+    Front-End-Https: on
+
+    X-Forwarded-Ssl: on
+
+It is however preferable to use the standard approach if configuring a new server.
 
- 
 #####################################################################
 
                If things don't work...
@@ -223,7 +246,7 @@ Retry the installation. As soon as the database has been created,
 % chmod 755 .htconfig.php
 
 #####################################################################
-- Some congiurations with "suhosin" security are configured without
+- Some configurations with "suhosin" security are configured without
 an ability to run external processes. Friendica requires this ability.
 Following are some notes provided by one of our members.
 #####################################################################