Merge pull request #3101 from lonvia/custom-geometry-type

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

diff --git a/docs/admin/Deployment.md b/docs/admin/Deployment.md
index 7d62df391f40b4bb049ead8bf5f45635fe91a783..8b63554608a96d753b6c3598a7fc5de7066ae443 100644 (file)
--- a/docs/admin/Deployment.md
+++ b/docs/admin/Deployment.md
@@ -82,7 +82,7 @@ The website should now be available on `http://localhost/nominatim`.
 
 ### Installing the required packages
 
 
 ### Installing the required packages
 

-Nginx has no built-in PHP interpreter. You need to use php-fpm as a deamon for
+Nginx has no built-in PHP interpreter. You need to use php-fpm as a daemon for

 serving PHP cgi.
 
 On Ubuntu/Debian install nginx and php-fpm with:
 serving PHP cgi.
 
 On Ubuntu/Debian install nginx and php-fpm with:


@@ -99,7 +99,7 @@ Unix socket instead, change the pool configuration
 
 ``` ini
 ; Replace the tcp listener and add the unix socket
 
 ``` ini
 ; Replace the tcp listener and add the unix socket

-listen = /var/run/php-fpm.sock
+listen = /var/run/php-fpm-nominatim.sock

 
 ; Ensure that the daemon runs as the correct user
 listen.owner = www-data
 
 ; Ensure that the daemon runs as the correct user
 listen.owner = www-data


@@ -121,7 +121,7 @@ location @php {
     fastcgi_param SCRIPT_FILENAME "$document_root$uri.php";
     fastcgi_param PATH_TRANSLATED "$document_root$uri.php";
     fastcgi_param QUERY_STRING    $args;
     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-fpm.sock;
+    fastcgi_pass unix:/var/run/php-fpm-nominatim.sock;

     fastcgi_index index.php;
     include fastcgi_params;
 }
     fastcgi_index index.php;
     include fastcgi_params;
 }


@@ -131,7 +131,7 @@ location ~ [^/]\.php(/|$) {
     if (!-f $document_root$fastcgi_script_name) {
         return 404;
     }
     if (!-f $document_root$fastcgi_script_name) {
         return 404;
     }

-    fastcgi_pass unix:/var/run/php-fpm.sock;
+    fastcgi_pass unix:/var/run/php-fpm-nominatim.sock;

     fastcgi_index search.php;
     include fastcgi.conf;
 }
     fastcgi_index search.php;
     include fastcgi.conf;
 }


@@ -140,3 +140,9 @@ location ~ [^/]\.php(/|$) {
 Restart the nginx and php-fpm services and the website should now be available
 at `http://localhost/`.
 
 Restart the nginx and php-fpm services and the website should now be available
 at `http://localhost/`.
 

+## Nominatim with other webservers
+
+Users have created instructions for other webservers:
+
+* [Caddy](https://github.com/osm-search/Nominatim/discussions/2580)
+