Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

[friendica.git] / INSTALL.txt

diff --git a/INSTALL.txt b/INSTALL.txt
index 71671af3f19d8117bc67cdfea91558effdce8c03..a9d42495bcc70d35f4c9b23ebc0a0bdf3077226b 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -32,8 +32,7 @@ link if your cert is self-signed).
        - Apache with mod-rewrite enabled and "Options All" so you can use a 
 local .htaccess file
 
-       - PHP 5.2+. The later the better. PHP 5.3 is required for communications 
-with the Diaspora network and improved security.
+       - PHP 5.4+.
 
                - PHP *command line* access with register_argc_argv set to true in the 
 php.ini file [or see 'poormancron' in section 8]
@@ -42,7 +41,7 @@ php.ini file [or see 'poormancron' in section 8]
 
                - some form of email server or email gateway such that PHP mail() works
 
-       - Mysql 5.x
+       - Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
 
        - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks
 (Windows) [Note: other options are presented in Section 8 of this document]
@@ -154,18 +153,6 @@ Friendica also supports a number on non-standard headers in common use.
     X-Forwarded-Ssl: on
 
 It is however preferable to use the standard approach if configuring a new server.
-In Nginx, this can be done as follows (assuming Friendica runs on port 8080).
-
-    location / {
-            if ( $scheme != https ) {          # Force Redirect to HTTPS
-                    return 302 https://$host$uri;
-            }
-            proxy_pass http://localhost:8080;
-            proxy_redirect off;
-            proxy_set_header Host $host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Forwarded "for=$proxy_add_x_forwarded_for; proto=$scheme";
-    }
 
 #####################################################################