X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8c3a0efe8b75a06279998e66a932d8a56c483961..8218da27b3574d8c748f44ae3e59b0132ff56d73:/docs/admin/Installation.md diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md index 2d8936bd..f3f54794 100644 --- a/docs/admin/Installation.md +++ b/docs/admin/Installation.md @@ -125,13 +125,15 @@ from there. Make sure your Apache configuration contains the required permissions for the directory and create an alias: - - Options FollowSymLinks MultiViews - AddType text/html .php - DirectoryIndex search.php - Require all granted - - Alias /nominatim /srv/nominatim/build/website +``` apache + + Options FollowSymLinks MultiViews + AddType text/html .php + DirectoryIndex search.php + Require all granted + +Alias /nominatim /srv/nominatim/build/website +``` `/srv/nominatim/build` should be replaced with the location of your build directory. @@ -159,30 +161,32 @@ 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 / { - 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/php7.2-fpm.sock; - fastcgi_index search.php; - include fastcgi.conf; +``` nginx +root /srv/nominatim/build/website; +index search.php; +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.3-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/php7.3-fpm.sock; + fastcgi_index search.php; + include fastcgi.conf; +} +``` Restart the nginx and php5-fpm services and the website should now be available at `http://localhost/`.