Merge remote-tracking branch 'upstream/master'

[nominatim.git] / docs / Installation.md

diff --git a/docs/Installation.md b/docs/Installation.md
index 5a3100e5fe9575485c86a978a89c96af452176af..1cdd9d109014b039cbaaf40965ecec74620fb12e 100644 (file)
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -5,8 +5,8 @@ This page contains generic installation instructions for Nominatim and its
 prerequisites. There are also step-by-step instructions available for
 the following operating systems:
 
-  * [Ubuntu 16.04](install-on-ubuntu-16.md)
-  * [CentOS 7.2](install-on-centos-7.md)
+  * [Ubuntu 16.04](Install-on-Ubuntu-16.md)
+  * [CentOS 7.2](Install-on-Centos-7.md)
 
 These OS-specific instructions can also be found in executable form
 in the `vagrant/` directory.
@@ -28,8 +28,7 @@ required for compiling osm2pgsql.
 
 For running tests:
 
-  * [lettuce](http://lettuce.it)
-  * [Shapely](http://toblerity.org/shapely/index.html)
+  * [behave](http://pythonhosted.org/behave/)
   * [Psycopg2](http://initd.org/psycopg)
   * [nose](https://nose.readthedocs.io)
   * [phpunit](https://phpunit.de)
@@ -38,14 +37,15 @@ For running Nominatim:
 
   * [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
+  * PHP-intl (bundled with PHP)
   * [PEAR::DB](http://pear.php.net/package/DB)
   * a webserver (apache or nginx are recommended)
 
 For running continuous updates:
 
-  * [osmosis](http://wiki.openstreetmap.org/wiki/Osmosis)
+  * [pyosmium](http://osmcode.org/pyosmium/)
 
 ### Hardware
 
@@ -104,6 +104,7 @@ directory and create an alias:
     <Directory "/srv/nominatim/build/website">
       Options FollowSymLinks MultiViews
       AddType text/html   .php
+      DirectoryIndex search.php
       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.
 
+    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;
-        fastcgi_index index.php;
+        fastcgi_index search.php;
         include fastcgi.conf;
     }
 
@@ -148,4 +151,4 @@ Restart the nginx and php5-fpm services and the website should now be available
 on http://localhost/.
 
 
-Now continue with [importing the database](Import_and_update.md).
+Now continue with [importing the database](Import-and-Update.md).