adapt CONTRIBUTING.md to new test locations and tools

[nominatim.git] / docs / Installation.md

diff --git a/docs/Installation.md b/docs/Installation.md
index 2e6243963a753049c24d20c6c2ac8824c16a5465..7f108160a25e40324e855bea2d83e532cd6ed3e9 100644 (file)
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -38,7 +38,7 @@ For running Nominatim:
 
   * [PostgreSQL](http://www.postgresql.org) (9.1 or later)
   * [PostGIS](http://postgis.refractions.net) (2.0 or later)
 
   * [PostgreSQL](http://www.postgresql.org) (9.1 or later)
   * [PostGIS](http://postgis.refractions.net) (2.0 or later)

-  * [PHP](http://php.net)
+  * [PHP](http://php.net) (5.4 or later)

   * PHP-pgsql
   * [PEAR::DB](http://pear.php.net/package/DB)
   * a webserver (apache or nginx are recommended)
   * PHP-pgsql
   * [PEAR::DB](http://pear.php.net/package/DB)
   * a webserver (apache or nginx are recommended)


@@ -103,7 +103,8 @@ directory and create an alias:
 
     <Directory "/srv/nominatim/build/website">
       Options FollowSymLinks MultiViews
 
     <Directory "/srv/nominatim/build/website">
       Options FollowSymLinks MultiViews

-      AddTpe text/html   .php
+      AddType text/html   .php
+      DirectoryIndex search.php

       Require all granted
     </Directory>
     Alias /nominatim /srv/nominatim/build/website
       Require all granted
     </Directory>
     Alias /nominatim /srv/nominatim/build/website


@@ -134,13 +135,15 @@ follows:
 Tell nginx that php files are special and to fastcgi_pass to the php-fpm
 unix socket by adding the location definition to the default configuration.
 
 Tell nginx that php files are special and to fastcgi_pass to the php-fpm
 unix socket by adding the location definition to the default configuration.
 

+    root /srv/nominatim/build/website;
+    index search.php index.html;

     location ~ [^/]\.php(/|$) {
         fastcgi_split_path_info ^(.+?\.php)(/.*)$;
         if (!-f $document_root$fastcgi_script_name) {
             return 404;
         }
         fastcgi_pass unix:/var/run/php5-fpm.sock;
     location ~ [^/]\.php(/|$) {
         fastcgi_split_path_info ^(.+?\.php)(/.*)$;
         if (!-f $document_root$fastcgi_script_name) {
             return 404;
         }
         fastcgi_pass unix:/var/run/php5-fpm.sock;

-        fastcgi_index index.php;
+        fastcgi_index search.php;

         include fastcgi.conf;
     }
 
         include fastcgi.conf;
     }