X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/91e1e4d614edcd13dc19ac1409a9cf812ead964c..9e54d1d6eb3e418c13ea090eeee4c9f9ee30b55a:/docs/Installation.md diff --git a/docs/Installation.md b/docs/Installation.md index fd4f8d0b..7f108160 100644 --- 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) - * [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) @@ -74,7 +74,7 @@ your `postgresql.conf` file. work_mem (50MB) effective_cache_size (24GB) synchronous_commit = off - checkpoint_segments = 100 + checkpoint_segments = 100 # only for postgresql <= 9.4 checkpoint_timeout = 10min checkpoint_completion_target = 0.9 @@ -103,7 +103,8 @@ directory and create an alias: Options FollowSymLinks MultiViews - AddTpe text/html .php + AddType text/html .php + DirectoryIndex search.php Require all granted 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; }