mostly remove php-cgi requirement

This is now only needed for BDD tests against the php API.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8200e7572beb9548ee78f412e1e2146ee80347e0..8868ea32e31ef2db8f2e3482f17c99b56ddd6109 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,16 +92,6 @@ if (BUILD_API OR BUILD_IMPORTER)
     else()
         message (STATUS "Using PHP binary " ${PHP_BIN})
     endif()
-    if (NOT PHPCGI_BIN)
-        find_program (PHPCGI_BIN php-cgi)
-    endif()
-    # sanity check if PHP binary exists
-    if (NOT EXISTS ${PHPCGI_BIN})
-        message(WARNING "php-cgi binary not found. nominatim tool will not provide query functions.")
-        set (PHPCGI_BIN "")
-    else()
-        message (STATUS "Using php-cgi binary " ${PHPCGI_BIN})
-    endif()
 endif()
 
 #-----------------------------------------------------------------------------

diff --git a/cmake/tool-installed.tmpl b/cmake/tool-installed.tmpl
index e38dafabebb2ed447839a95b94a455f86ea73866..a6384f148ef2e5369692f4d9ec89a9de570ac98c 100644 (file)
--- a/cmake/tool-installed.tmpl
+++ b/cmake/tool-installed.tmpl
@@ -10,5 +10,4 @@ from nominatim import version
 version.GIT_COMMIT_HASH = '@GIT_HASH@'
 
 exit(cli.nominatim(module_dir='@NOMINATIM_LIBDIR@/module',
-                   osm2pgsql_path='@NOMINATIM_LIBDIR@/osm2pgsql',
-                   phpcgi_path='@PHPCGI_BIN@'))
+                   osm2pgsql_path='@NOMINATIM_LIBDIR@/osm2pgsql'))

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index 96c6c6dcdb079f1ad8a3422c433f9b8471c9abef..fcdbe899295e4b207d72d68f779fdb2caa79e17a 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -10,5 +10,4 @@ from nominatim import version
 version.GIT_COMMIT_HASH = '@GIT_HASH@'
 
 exit(cli.nominatim(module_dir='@CMAKE_BINARY_DIR@/module',
-                   osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql',
-                   phpcgi_path='@PHPCGI_BIN@'))
+                   osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql'))

diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md
index 108d4a8aec0fc0fbbc064cbd4b4825d9aa8a8583..d85359fad6e4075b2c20b5906446fd3f3f54e36d 100644 (file)
--- a/docs/admin/Installation.md
+++ b/docs/admin/Installation.md
@@ -56,7 +56,6 @@ For running Nominatim:
   * [PHP](https://php.net) (7.3+)
   * PHP-pgsql
   * PHP-intl (bundled with PHP)
-  * PHP-cgi (for running queries from the command line)
 
 For running continuous updates:
 

diff --git a/man/create-manpage.tmpl b/man/create-manpage.tmpl
index 34f00a8bbc9fb0658b7243744dc12f4d31647e4e..427bcb63b1d619e53dedf79a714bd96738905f5b 100644 (file)
--- a/man/create-manpage.tmpl
+++ b/man/create-manpage.tmpl
@@ -7,6 +7,6 @@ sys.path.append('@PROJECT_SOURCE_DIR@')
 from nominatim.cli import get_set_parser
 
 def get_parser():
-    parser = get_set_parser(phpcgi_path='@PHPCGI_BIN@')
+    parser = get_set_parser()
 
     return parser.parser

diff --git a/nominatim/cli.py b/nominatim/cli.py
index 4a8fe3e446cdfbf9f74d68d5d3d7659814d190e9..1029ee7a91247f693c75d990c2de46df7e35e3ef 100644 (file)
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -101,7 +101,6 @@ class CommandlineParser:
             self.parser.print_help()
             return 1
 
-        args.phpcgi_path = Path(kwargs['phpcgi_path'])
         args.project_dir = Path(args.project_dir).resolve()
 
         if 'cli_args' not in kwargs:

diff --git a/nominatim/clicmd/args.py b/nominatim/clicmd/args.py
index e3150c3e6f2739d1bca416b649decfe882131410..8b805496fffd750bec95f9e25303e17c5eca6305 100644 (file)
--- a/nominatim/clicmd/args.py
+++ b/nominatim/clicmd/args.py
@@ -44,7 +44,6 @@ class NominatimArgs:
     # Basic environment set by root program.
     config: Configuration
     project_dir: Path
-    phpcgi_path: Path
 
     # Global switches
     version: bool

diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py
index 572c571a1318e18097311a8fa7c61f7aeedf8ae3..7299988b2330d5369d27d312c350afed48f53500 100644 (file)
--- a/test/bdd/steps/nominatim_environment.py
+++ b/test/bdd/steps/nominatim_environment.py
@@ -305,7 +305,6 @@ class NominatimEnvironment:
         cli.nominatim(module_dir='',
                       osm2pgsql_path=str(self.build_dir / 'osm2pgsql' / 'osm2pgsql'),
                       cli_args=cmdline,
-                      phpcgi_path='',
                       environ=self.test_env)
 
 

diff --git a/test/python/cli/conftest.py b/test/python/cli/conftest.py
index d4e1118e780478a833fa7f7fd0700270b4dbbf7c..928ca59c5e4ffbc6d6ded30e4007e3f2d4553095 100644 (file)
--- a/test/python/cli/conftest.py
+++ b/test/python/cli/conftest.py
@@ -53,7 +53,6 @@ def cli_call(src_dir):
     def _call_nominatim(*args):
         return nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
                                        osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
-                                       phpcgi_path='/usr/bin/php-cgi',
                                        cli_args=args)
 
     return _call_nominatim

diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh
index e52bdee7645c6ea8f889406e9fb2b100f71e7827..0f664da2b70fb4eb2b97019ceec938c30d25c150 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-20.sh
+++ b/vagrant/Install-on-Ubuntu-20.sh
@@ -20,7 +20,6 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 
 # Now you can install all packages needed for Nominatim:
 
-    sudo apt install -y php-cgi
     sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                         libboost-filesystem-dev libexpat1-dev zlib1g-dev \
                         libbz2-dev libpq-dev liblua5.3-dev lua5.3 lua-dkjson \

diff --git a/vagrant/Install-on-Ubuntu-22.sh b/vagrant/Install-on-Ubuntu-22.sh
index fdb38203cc1959069ade4498e6f53103c15c5d10..b170daad4e0ab22055e4ea4f94bb2ffa2e82e319 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-22.sh
+++ b/vagrant/Install-on-Ubuntu-22.sh
@@ -20,7 +20,6 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 
 # Now you can install all packages needed for Nominatim:
 
-    sudo apt install -y php-cgi
     sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                         libboost-filesystem-dev libexpat1-dev zlib1g-dev \
                         libbz2-dev libpq-dev liblua5.3-dev lua5.3 lua-dkjson \