Merge branch 'patch-1' of https://github.com/ganeshkrishnan1/Nominatim into ganeshkri...

[nominatim.git] / docs / admin / Installation.md

diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md
index 0dd6579b98cb1fa734e22d66d898a6486993eceb..2d8936bdbbca2a2c2eff03fffe88ac1458d5be34 100644 (file)
--- a/docs/admin/Installation.md
+++ b/docs/admin/Installation.md
@@ -4,8 +4,9 @@ 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 20.04](../appendix/Install-on-Ubuntu-20.md)
   * [Ubuntu 18.04](../appendix/Install-on-Ubuntu-18.md)
-  * [Ubuntu 16.04](../appendix/Install-on-Ubuntu-16.md)
+  * [CentOS 8](../appendix/Install-on-Centos-8.md)
   * [CentOS 7.2](../appendix/Install-on-Centos-7.md)
 
 These OS-specific instructions can also be found in executable form
@@ -56,7 +57,7 @@ For running tests:
 
   * [behave](http://pythonhosted.org/behave/)
   * [nose](https://nose.readthedocs.io)
-  * [phpunit](https://phpunit.de)
+  * [phpunit](https://phpunit.de) >= 7.3
 
 ### Hardware
 
@@ -160,12 +161,25 @@ unix socket by adding the location definition to the default configuration.
 
     root /srv/nominatim/build/website;
     index search.php index.html;
+    location / {
+            try_files $uri $uri/ @php;
+    }
+
+    location @php {
+            fastcgi_param SCRIPT_FILENAME "$document_root$uri.php";
+            fastcgi_param PATH_TRANSLATED "$document_root$uri.php";
+            fastcgi_param QUERY_STRING    $args;
+            fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
+            fastcgi_index index.php;
+            include fastcgi_params;
+    }
+
     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_pass unix:/var/run/php7.2-fpm.sock;
         fastcgi_index search.php;
         include fastcgi.conf;
     }