do not overwrite custom set module paths

[nominatim.git] / lib / setup / SetupClass.php

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index f16c9e60cc3a22bcc713046cade8b791a5fc9136..dda491603c3e673576f35ab0e03802874127ee82 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -2,14 +2,12 @@
 
 namespace Nominatim\Setup;
 
 
 namespace Nominatim\Setup;
 

-require_once(CONST_BasePath.'/lib/setup/AddressLevelParser.php');
-require_once(CONST_BasePath.'/lib/Shell.php');
+require_once(CONST_LibDir.'/Shell.php');

 
 class SetupFunctions
 {
     protected $iCacheMemory;
     protected $iInstances;
 
 class SetupFunctions
 {
     protected $iCacheMemory;
     protected $iInstances;

-    protected $sModulePath;

     protected $aDSNInfo;
     protected $bQuiet;
     protected $bVerbose;
     protected $aDSNInfo;
     protected $bQuiet;
     protected $bVerbose;


@@ -19,6 +17,7 @@ class SetupFunctions
     protected $bNoPartitions;
     protected $bDrop;
     protected $oDB = null;
     protected $bNoPartitions;
     protected $bDrop;
     protected $oDB = null;

+    protected $oNominatimCmd;

 
     public function __construct(array $aCMDResult)
     {
 
     public function __construct(array $aCMDResult)
     {


@@ -34,7 +33,7 @@ class SetupFunctions
 
         if (isset($aCMDResult['osm2pgsql-cache'])) {
             $this->iCacheMemory = $aCMDResult['osm2pgsql-cache'];
 
         if (isset($aCMDResult['osm2pgsql-cache'])) {
             $this->iCacheMemory = $aCMDResult['osm2pgsql-cache'];

-        } elseif (!is_null(CONST_Osm2pgsql_Flatnode_File)) {
+        } elseif (getSetting('FLATNODE_FILE')) {

             // When flatnode files are enabled then disable cache per default.
             $this->iCacheMemory = 0;
         } else {
             // When flatnode files are enabled then disable cache per default.
             $this->iCacheMemory = 0;
         } else {


@@ -42,11 +41,8 @@ class SetupFunctions
             $this->iCacheMemory = getCacheMemoryMB();
         }
 
             $this->iCacheMemory = getCacheMemoryMB();
         }
 

-        $this->sModulePath = CONST_Database_Module_Path;
-        info('module path: ' . $this->sModulePath);
-

         // parse database string
         // parse database string

-        $this->aDSNInfo = \Nominatim\DB::parseDSN(CONST_Database_DSN);
+        $this->aDSNInfo = \Nominatim\DB::parseDSN(getSetting('DATABASE_DSN'));

         if (!isset($this->aDSNInfo['port'])) {
             $this->aDSNInfo['port'] = 5432;
         }
         if (!isset($this->aDSNInfo['port'])) {
             $this->aDSNInfo['port'] = 5432;
         }


@@ -78,6 +74,14 @@ class SetupFunctions
         }
 
         $this->bDrop = isset($aCMDResult['drop']) && $aCMDResult['drop'];
         }
 
         $this->bDrop = isset($aCMDResult['drop']) && $aCMDResult['drop'];

+
+        $this->oNominatimCmd = new \Nominatim\Shell(getSetting('NOMINATIM_TOOL'));
+        if ($this->bQuiet) {
+            $this->oNominatimCmd->addParams('--quiet');
+        }
+        if ($this->bVerbose) {
+            $this->oNominatimCmd->addParams('--verbose');
+        }

     }
 
     public function createDB()
     }
 
     public function createDB()


@@ -86,7 +90,7 @@ class SetupFunctions
         $oDB = new \Nominatim\DB;
 
         if ($oDB->checkConnection()) {
         $oDB = new \Nominatim\DB;
 
         if ($oDB->checkConnection()) {

-            fail('database already exists ('.CONST_Database_DSN.')');
+            fail('database already exists ('.getSetting('DATABASE_DSN').')');

         }
 
         $oCmd = (new \Nominatim\Shell('createdb'))
         }
 
         $oCmd = (new \Nominatim\Shell('createdb'))


@@ -130,34 +134,56 @@ class SetupFunctions
             exit(1);
         }
 
             exit(1);
         }
 

-        $i = $this->db()->getOne("select count(*) from pg_user where usename = '".CONST_Database_Web_User."'");
+        $sPgUser = getSetting('DATABASE_WEBUSER');
+        $i = $this->db()->getOne("select count(*) from pg_user where usename = '$sPgUser'");

         if ($i == 0) {
         if ($i == 0) {

-            echo "\nERROR: Web user '".CONST_Database_Web_User."' does not exist. Create it with:\n";
-            echo "\n          createuser ".CONST_Database_Web_User."\n\n";
+            echo "\nERROR: Web user '".$sPgUser."' does not exist. Create it with:\n";
+            echo "\n          createuser ".$sPgUser."\n\n";

             exit(1);
         }
 
             exit(1);
         }
 

+        if (!getSetting('DATABASE_MODULE_PATH')) {
+            // If no custom module path is set then copy the module into the
+            // project directory, but only if it is not the same file already
+            // (aka we are running from the build dir).
+            $sDest = CONST_InstallDir.'/module';
+            if ($sDest != CONST_Default_ModulePath) {
+                if (!file_exists($sDest)) {
+                    mkdir($sDest);
+                }
+                if (!copy(CONST_Default_ModulePath.'/nominatim.so', $sDest.'/nominatim.so')) {
+                    echo "Failed to copy database module to $sDest.";
+                    exit(1);
+                }
+                chmod($sDest.'/nominatim.so', 0755);
+                info("Database module installed at $sDest.");
+            } else {
+                info('Running from build directory. Leaving database module as is.');
+            }
+        } else {
+            info('Using database module from DATABASE_MODULE_PATH ('.getSetting('DATABASE_MODULE_PATH').').');
+        }

         // Try accessing the C module, so we know early if something is wrong
         // Try accessing the C module, so we know early if something is wrong

-        checkModulePresence(); // raises exception on failure
+        $this->checkModulePresence(); // raises exception on failure

 
 

-        if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) {
+        if (!file_exists(CONST_DataDir.'/data/country_osm_grid.sql.gz')) {

             echo 'Error: you need to download the country_osm_grid first:';
             echo 'Error: you need to download the country_osm_grid first:';

-            echo "\n    wget -O ".CONST_ExtraDataPath."/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz\n";
+            echo "\n    wget -O ".CONST_DataDir."/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz\n";

             exit(1);
         }
             exit(1);
         }

-        $this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
-        $this->pgsqlRunScriptFile(CONST_ExtraDataPath.'/country_osm_grid.sql.gz');
-        $this->pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_table.sql');
-        $this->pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode_table.sql');
+        $this->pgsqlRunScriptFile(CONST_DataDir.'/data/country_name.sql');
+        $this->pgsqlRunScriptFile(CONST_DataDir.'/data/country_osm_grid.sql.gz');
+        $this->pgsqlRunScriptFile(CONST_DataDir.'/data/gb_postcode_table.sql');
+        $this->pgsqlRunScriptFile(CONST_DataDir.'/data/us_postcode_table.sql');

 
 

-        $sPostcodeFilename = CONST_BasePath.'/data/gb_postcode_data.sql.gz';
+        $sPostcodeFilename = CONST_InstallDir.'/gb_postcode_data.sql.gz';

         if (file_exists($sPostcodeFilename)) {
             $this->pgsqlRunScriptFile($sPostcodeFilename);
         } else {
             warn('optional external GB postcode table file ('.$sPostcodeFilename.') not found. Skipping.');
         }
 
         if (file_exists($sPostcodeFilename)) {
             $this->pgsqlRunScriptFile($sPostcodeFilename);
         } else {
             warn('optional external GB postcode table file ('.$sPostcodeFilename.') not found. Skipping.');
         }
 

-        $sPostcodeFilename = CONST_BasePath.'/data/us_postcode_data.sql.gz';
+        $sPostcodeFilename = CONST_InstallDir.'/us_postcode_data.sql.gz';

         if (file_exists($sPostcodeFilename)) {
             $this->pgsqlRunScriptFile($sPostcodeFilename);
         } else {
         if (file_exists($sPostcodeFilename)) {
             $this->pgsqlRunScriptFile($sPostcodeFilename);
         } else {


@@ -173,29 +199,29 @@ class SetupFunctions
     {
         info('Import data');
 
     {
         info('Import data');
 

-        if (!file_exists(CONST_Osm2pgsql_Binary)) {
-            echo "Check CONST_Osm2pgsql_Binary in your local settings file.\n";
+        if (!file_exists(getOsm2pgsqlBinary())) {
+            echo "Check NOMINATIM_OSM2PGSQL_BINARY in your local .env file.\n";

             echo "Normally you should not need to set this manually.\n";
             echo "Normally you should not need to set this manually.\n";

-            fail("osm2pgsql not found in '".CONST_Osm2pgsql_Binary."'");
+            fail("osm2pgsql not found in '".getOsm2pgsqlBinary()."'");

         }
 
         }
 

-        $oCmd = new \Nominatim\Shell(CONST_Osm2pgsql_Binary);
-        $oCmd->addParams('--style', CONST_Import_Style);
+        $oCmd = new \Nominatim\Shell(getOsm2pgsqlBinary());
+        $oCmd->addParams('--style', getImportStyle());

 
 

-        if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
-            $oCmd->addParams('--flat-nodes', CONST_Osm2pgsql_Flatnode_File);
+        if (getSetting('FLATNODE_FILE')) {
+            $oCmd->addParams('--flat-nodes', getSetting('FLATNODE_FILE'));

         }
         }

-        if (CONST_Tablespace_Osm2pgsql_Data) {
-            $oCmd->addParams('--tablespace-slim-data', CONST_Tablespace_Osm2pgsql_Data);
+        if (getSetting('TABLESPACE_OSM_DATA')) {
+            $oCmd->addParams('--tablespace-slim-data', getSetting('TABLESPACE_OSM_DATA'));

         }
         }

-        if (CONST_Tablespace_Osm2pgsql_Index) {
-            $oCmd->addParams('--tablespace-slim-index', CONST_Tablespace_Osm2pgsql_Index);
+        if (getSetting('TABLESPACE_OSM_INDEX')) {
+            $oCmd->addParams('--tablespace-slim-index', getSetting('TABLESPACE_OSM_INDEX'));

         }
         }

-        if (CONST_Tablespace_Place_Data) {
-            $oCmd->addParams('--tablespace-main-data', CONST_Tablespace_Place_Data);
+        if (getSetting('TABLESPACE_PLACE_DATA')) {
+            $oCmd->addParams('--tablespace-main-data', getSetting('TABLESPACE_PLACE_DATA'));

         }
         }

-        if (CONST_Tablespace_Place_Index) {
-            $oCmd->addParams('--tablespace-main-index', CONST_Tablespace_Place_Index);
+        if (getSetting('TABLESPACE_PLACE_INDEX')) {
+            $oCmd->addParams('--tablespace-main-index', getSetting('TABLESPACE_PLACE_INDEX'));

         }
         $oCmd->addParams('--latlong', '--slim', '--create');
         $oCmd->addParams('--output', 'gazetteer');
         }
         $oCmd->addParams('--latlong', '--slim', '--create');
         $oCmd->addParams('--output', 'gazetteer');


@@ -234,7 +260,7 @@ class SetupFunctions
         info('Create Functions');
 
         // Try accessing the C module, so we know early if something is wrong
         info('Create Functions');
 
         // Try accessing the C module, so we know early if something is wrong

-        checkModulePresence(); // raises exception on failure
+        $this->checkModulePresence(); // raises exception on failure

 
         $this->createSqlFunctions();
     }
 
         $this->createSqlFunctions();
     }


@@ -243,7 +269,7 @@ class SetupFunctions
     {
         info('Create Tables');
 
     {
         info('Create Tables');
 

-        $sTemplate = file_get_contents(CONST_BasePath.'/sql/tables.sql');
+        $sTemplate = file_get_contents(CONST_DataDir.'/sql/tables.sql');

         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunScript($sTemplate, false);
         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunScript($sTemplate, false);


@@ -252,15 +278,14 @@ class SetupFunctions
             $this->dropTable('search_name');
         }
 
             $this->dropTable('search_name');
         }
 

-        $oAlParser = new AddressLevelParser(CONST_Address_Level_Config);
-        $oAlParser->createTable($this->db(), 'address_levels');
+        (clone($this->oNominatimCmd))->addParams('refresh', '--address-levels')->run();

     }
 
     public function createTableTriggers()
     {
         info('Create Tables');
 
     }
 
     public function createTableTriggers()
     {
         info('Create Tables');
 

-        $sTemplate = file_get_contents(CONST_BasePath.'/sql/table-triggers.sql');
+        $sTemplate = file_get_contents(CONST_DataDir.'/sql/table-triggers.sql');

         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunScript($sTemplate, false);
         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunScript($sTemplate, false);


@@ -270,7 +295,7 @@ class SetupFunctions
     {
         info('Create Partition Tables');
 
     {
         info('Create Partition Tables');
 

-        $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');
+        $sTemplate = file_get_contents(CONST_DataDir.'/sql/partition-tables.src.sql');

         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunPartitionScript($sTemplate);
         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunPartitionScript($sTemplate);


@@ -279,14 +304,13 @@ class SetupFunctions
     public function createPartitionFunctions()
     {
         info('Create Partition Functions');
     public function createPartitionFunctions()
     {
         info('Create Partition Functions');

-
-        $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');
-        $this->pgsqlRunPartitionScript($sTemplate);
+        $this->createSqlFunctions(); // also create partition functions

     }
 
     public function importWikipediaArticles()
     {
     }
 
     public function importWikipediaArticles()
     {

-        $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikimedia-importance.sql.gz';
+        $sWikiArticlePath = getSetting('WIKIPEDIA_DATA_PATH', CONST_InstallDir);
+        $sWikiArticlesFile = $sWikiArticlePath.'/wikimedia-importance.sql.gz';

         if (file_exists($sWikiArticlesFile)) {
             info('Importing wikipedia articles and redirects');
             $this->dropTable('wikipedia_article');
         if (file_exists($sWikiArticlesFile)) {
             info('Importing wikipedia articles and redirects');
             $this->dropTable('wikipedia_article');


@@ -335,14 +359,14 @@ class SetupFunctions
 
         // used by getorcreate_word_id to ignore frequent partial words
         $sSQL = 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS ';
 
         // used by getorcreate_word_id to ignore frequent partial words
         $sSQL = 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS ';

-        $sSQL .= '$$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE';
+        $sSQL .= '$$ SELECT '.getSetting('MAX_WORD_FREQUENCY').' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE';

         $oDB->exec($sSQL);
         echo ".\n";
 
         // pre-create the word list
         if (!$bDisableTokenPrecalc) {
             info('Loading word list');
         $oDB->exec($sSQL);
         echo ".\n";
 
         // pre-create the word list
         if (!$bDisableTokenPrecalc) {
             info('Loading word list');

-            $this->pgsqlRunScriptFile(CONST_BasePath.'/data/words.sql');
+            $this->pgsqlRunScriptFile(CONST_DataDir.'/data/words.sql');

         }
 
         info('Load Data');
         }
 
         info('Load Data');


@@ -352,7 +376,7 @@ class SetupFunctions
         $iLoadThreads = max(1, $this->iInstances - 1);
         for ($i = 0; $i < $iLoadThreads; $i++) {
             // https://secure.php.net/manual/en/function.pg-connect.php
         $iLoadThreads = max(1, $this->iInstances - 1);
         for ($i = 0; $i < $iLoadThreads; $i++) {
             // https://secure.php.net/manual/en/function.pg-connect.php

-            $DSN = CONST_Database_DSN;
+            $DSN = getSetting('DATABASE_DSN');

             $DSN = preg_replace('/^pgsql:/', '', $DSN);
             $DSN = preg_replace('/;/', ' ', $DSN);
             $aDBInstances[$i] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW);
             $DSN = preg_replace('/^pgsql:/', '', $DSN);
             $DSN = preg_replace('/;/', ' ', $DSN);
             $aDBInstances[$i] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW);


@@ -372,7 +396,7 @@ class SetupFunctions
 
         // last thread for interpolation lines
         // https://secure.php.net/manual/en/function.pg-connect.php
 
         // last thread for interpolation lines
         // https://secure.php.net/manual/en/function.pg-connect.php

-        $DSN = CONST_Database_DSN;
+        $DSN = getSetting('DATABASE_DSN');

         $DSN = preg_replace('/^pgsql:/', '', $DSN);
         $DSN = preg_replace('/;/', ' ', $DSN);
         $aDBInstances[$iLoadThreads] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW);
         $DSN = preg_replace('/^pgsql:/', '', $DSN);
         $DSN = preg_replace('/;/', ' ', $DSN);
         $aDBInstances[$iLoadThreads] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW);


@@ -424,17 +448,17 @@ class SetupFunctions
         }
     }
 
         }
     }
 

-    public function importTigerData()
+    public function importTigerData($sTigerPath)

     {
         info('Import Tiger data');
 
     {
         info('Import Tiger data');
 

-        $aFilenames = glob(CONST_Tiger_Data_Path.'/*.sql');
-        info('Found '.count($aFilenames).' SQL files in path '.CONST_Tiger_Data_Path);
+        $aFilenames = glob($sTigerPath.'/*.sql');
+        info('Found '.count($aFilenames).' SQL files in path '.$sTigerPath);

         if (empty($aFilenames)) {
         if (empty($aFilenames)) {

-            warn('Tiger data import selected but no files found in path '.CONST_Tiger_Data_Path);
+            warn('Tiger data import selected but no files found in path '.$sTigerPath);

             return;
         }
             return;
         }

-        $sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_start.sql');
+        $sTemplate = file_get_contents(CONST_DataDir.'/sql/tiger_import_start.sql');

         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunScript($sTemplate, false);
         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunScript($sTemplate, false);


@@ -442,7 +466,7 @@ class SetupFunctions
         $aDBInstances = array();
         for ($i = 0; $i < $this->iInstances; $i++) {
             // https://secure.php.net/manual/en/function.pg-connect.php
         $aDBInstances = array();
         for ($i = 0; $i < $this->iInstances; $i++) {
             // https://secure.php.net/manual/en/function.pg-connect.php

-            $DSN = CONST_Database_DSN;
+            $DSN = getSetting('DATABASE_DSN');

             $DSN = preg_replace('/^pgsql:/', '', $DSN);
             $DSN = preg_replace('/;/', ' ', $DSN);
             $aDBInstances[$i] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW | PGSQL_CONNECT_ASYNC);
             $DSN = preg_replace('/^pgsql:/', '', $DSN);
             $DSN = preg_replace('/;/', ' ', $DSN);
             $aDBInstances[$i] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW | PGSQL_CONNECT_ASYNC);


@@ -488,7 +512,7 @@ class SetupFunctions
         }
 
         info('Creating indexes on Tiger data');
         }
 
         info('Creating indexes on Tiger data');

-        $sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_finish.sql');
+        $sTemplate = file_get_contents(CONST_DataDir.'/sql/tiger_import_finish.sql');

         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunScript($sTemplate, false);
         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         $this->pgsqlRunScript($sTemplate, false);


@@ -542,32 +566,12 @@ class SetupFunctions
 
     public function index($bIndexNoanalyse)
     {
 
     public function index($bIndexNoanalyse)
     {

-        checkModulePresence(); // raises exception on failure
+        $this->checkModulePresence(); // raises exception on failure

 
 

-        $oBaseCmd = (new \Nominatim\Shell(CONST_BasePath.'/nominatim/nominatim.py'))
-                    ->addParams('--database', $this->aDSNInfo['database'])
-                    ->addParams('--port', $this->aDSNInfo['port'])
-                    ->addParams('--threads', $this->iInstances);
-
-        if (!$this->bQuiet) {
-            $oBaseCmd->addParams('-v');
-        }
-        if ($this->bVerbose) {
-            $oBaseCmd->addParams('-v');
-        }
-        if (isset($this->aDSNInfo['hostspec'])) {
-            $oBaseCmd->addParams('--host', $this->aDSNInfo['hostspec']);
-        }
-        if (isset($this->aDSNInfo['username'])) {
-            $oBaseCmd->addParams('--user', $this->aDSNInfo['username']);
-        }
-        if (isset($this->aDSNInfo['password'])) {
-            $oBaseCmd->addEnvPair('PGPASSWORD', $this->aDSNInfo['password']);
-        }
+        $oBaseCmd = (clone $this->oNominatimCmd)->addParams('index');

 
         info('Index ranks 0 - 4');
         $oCmd = (clone $oBaseCmd)->addParams('--maxrank', 4);
 
         info('Index ranks 0 - 4');
         $oCmd = (clone $oBaseCmd)->addParams('--maxrank', 4);

-        echo $oCmd->escapedCmd();

 
         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
 
         $iStatus = $oCmd->run();
         if ($iStatus != 0) {


@@ -576,14 +580,14 @@ class SetupFunctions
         if (!$bIndexNoanalyse) $this->pgsqlRunScript('ANALYSE');
 
         info('Index administrative boundaries');
         if (!$bIndexNoanalyse) $this->pgsqlRunScript('ANALYSE');
 
         info('Index administrative boundaries');

-        $oCmd = (clone $oBaseCmd)->addParams('-b');
+        $oCmd = (clone $oBaseCmd)->addParams('--boundaries-only');

         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
             fail('error status ' . $iStatus . ' running nominatim!');
         }
 
         info('Index ranks 5 - 25');
         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
             fail('error status ' . $iStatus . ' running nominatim!');
         }
 
         info('Index ranks 5 - 25');

-        $oCmd = (clone $oBaseCmd)->addParams('--minrank', 5, '--maxrank', 25);
+        $oCmd = (clone $oBaseCmd)->addParams('--no-boundaries', '--minrank', 5, '--maxrank', 25);

         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
             fail('error status ' . $iStatus . ' running nominatim!');
         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
             fail('error status ' . $iStatus . ' running nominatim!');


@@ -592,7 +596,7 @@ class SetupFunctions
         if (!$bIndexNoanalyse) $this->pgsqlRunScript('ANALYSE');
 
         info('Index ranks 26 - 30');
         if (!$bIndexNoanalyse) $this->pgsqlRunScript('ANALYSE');
 
         info('Index ranks 26 - 30');

-        $oCmd = (clone $oBaseCmd)->addParams('--minrank', 26);
+        $oCmd = (clone $oBaseCmd)->addParams('--no-boundaries', '--minrank', 26);

         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
             fail('error status ' . $iStatus . ' running nominatim!');
         $iStatus = $oCmd->run();
         if ($iStatus != 0) {
             fail('error status ' . $iStatus . ' running nominatim!');


@@ -616,12 +620,12 @@ class SetupFunctions
             $this->db()->exec("DROP INDEX $sIndexName;");
         }
 
             $this->db()->exec("DROP INDEX $sIndexName;");
         }
 

-        $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
+        $sTemplate = file_get_contents(CONST_DataDir.'/sql/indices.src.sql');

         if (!$this->bDrop) {
         if (!$this->bDrop) {

-            $sTemplate .= file_get_contents(CONST_BasePath.'/sql/indices_updates.src.sql');
+            $sTemplate .= file_get_contents(CONST_DataDir.'/sql/indices_updates.src.sql');

         }
         if (!$this->dbReverseOnly()) {
         }
         if (!$this->dbReverseOnly()) {

-            $sTemplate .= file_get_contents(CONST_BasePath.'/sql/indices_search.src.sql');
+            $sTemplate .= file_get_contents(CONST_DataDir.'/sql/indices_search.src.sql');

         }
         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 
         }
         $sTemplate = $this->replaceSqlPatterns($sTemplate);
 


@@ -638,10 +642,11 @@ class SetupFunctions
         $this->pgsqlRunScript("select count(*) from (select getorcreate_country(make_standard_name(name->'name'), country_code) from country_name where name ? 'name') as x");
         $sSQL = 'select count(*) from (select getorcreate_country(make_standard_name(v),'
             .'country_code) from (select country_code, skeys(name) as k, svals(name) as v from country_name) x where k ';
         $this->pgsqlRunScript("select count(*) from (select getorcreate_country(make_standard_name(name->'name'), country_code) from country_name where name ? 'name') as x");
         $sSQL = 'select count(*) from (select getorcreate_country(make_standard_name(v),'
             .'country_code) from (select country_code, skeys(name) as k, svals(name) as v from country_name) x where k ';

-        if (CONST_Languages) {
+        $sLanguages = getSetting('LANGUAGES');
+        if ($sLanguages) {

             $sSQL .= 'in ';
             $sDelim = '(';
             $sSQL .= 'in ';
             $sDelim = '(';

-            foreach (explode(',', CONST_Languages) as $sLang) {
+            foreach (explode(',', $sLanguages) as $sLang) {

                 $sSQL .= $sDelim."'name:$sLang'";
                 $sDelim = ',';
             }
                 $sSQL .= $sDelim."'name:$sLang'";
                 $sDelim = ',';
             }


@@ -703,36 +708,57 @@ class SetupFunctions
     }
 
     /**
     }
 
     /**

-     * Setup settings-frontend.php in the build/website directory
+     * Setup the directory for the API scripts.

      *
      * @return null
      */
     public function setupWebsite()
     {
      *
      * @return null
      */
     public function setupWebsite()
     {

-        $rOutputFile = fopen(CONST_InstallPath.'/settings/settings-frontend.php', 'w');
-
-        fwrite($rOutputFile, "<?php
-@define('CONST_BasePath', '".CONST_BasePath."');
-if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
-
-@define('CONST_Database_DSN', '".CONST_Database_DSN."');
-@define('CONST_Default_Language', ".(CONST_Default_Language ? ("'".CONST_Default_Language."'") : 'false').");
-@define('CONST_Log_DB', ".(CONST_Log_DB ? 'true' : 'false').");
-@define('CONST_Log_File', ".(CONST_Log_File ? ("'".CONST_Log_File."'")  : 'false').");
-@define('CONST_Max_Word_Frequency', '".CONST_Max_Word_Frequency."');
-@define('CONST_NoAccessControl', ".CONST_NoAccessControl.");
-@define('CONST_Places_Max_ID_count', ".CONST_Places_Max_ID_count.");
-@define('CONST_PolygonOutput_MaximumTypes', ".CONST_PolygonOutput_MaximumTypes.");
-@define('CONST_Search_AreaPolygons', ".CONST_Search_AreaPolygons.");
-@define('CONST_Search_BatchMode', ".(CONST_Search_BatchMode ? 'true' : 'false').");
-@define('CONST_Search_NameOnlySearchFrequencyThreshold', ".CONST_Search_NameOnlySearchFrequencyThreshold.");
-@define('CONST_Search_ReversePlanForAll', ".CONST_Search_ReversePlanForAll.");
-@define('CONST_Term_Normalization_Rules', \"".CONST_Term_Normalization_Rules."\");
-@define('CONST_Use_Aux_Location_data', ".(CONST_Use_Aux_Location_data ? 'true' : 'false').");
-@define('CONST_Use_US_Tiger_Data', ".(CONST_Use_US_Tiger_Data ? 'true' : 'false').");
-@define('CONST_MapIcon_URL', ".(CONST_MapIcon_URL ? ("'".CONST_MapIcon_URL."'") : 'false').');
-');
-        info(CONST_InstallPath.'/settings/settings-frontend.php has been set up successfully');
+        if (!is_dir(CONST_InstallDir.'/website')) {
+            info('Creating directory for website scripts at: '.CONST_InstallDir.'/website');
+            mkdir(CONST_InstallDir.'/website');
+        }
+
+        $aScripts = array(
+          'deletable.php',
+          'details.php',
+          'lookup.php',
+          'polygons.php',
+          'reverse.php',
+          'search.php',
+          'status.php'
+        );
+
+        foreach ($aScripts as $sScript) {
+            $rFile = fopen(CONST_InstallDir.'/website/'.$sScript, 'w');
+
+            fwrite($rFile, "<?php\n\n");
+            fwrite($rFile, '@define(\'CONST_Debug\', $_GET[\'debug\'] ?? false);'."\n\n");
+
+            fwriteConstDef($rFile, 'LibDir', CONST_LibDir);
+            fwriteConstDef($rFile, 'DataDir', CONST_DataDir);
+            fwriteConstDef($rFile, 'InstallDir', CONST_InstallDir);
+            fwriteConstDef($rFile, 'Database_DSN', getSetting('DATABASE_DSN'));
+            fwriteConstDef($rFile, 'Default_Language', getSetting('DEFAULT_LANGUAGE'));
+            fwriteConstDef($rFile, 'Log_DB', getSettingBool('LOG_DB'));
+            fwriteConstDef($rFile, 'Log_File', getSetting('LOG_FILE'));
+            fwriteConstDef($rFile, 'Max_Word_Frequency', (int)getSetting('MAX_WORD_FREQUENCY'));
+            fwriteConstDef($rFile, 'NoAccessControl', getSettingBool('CORS_NOACCESSCONTROL'));
+            fwriteConstDef($rFile, 'Places_Max_ID_count', (int)getSetting('LOOKUP_MAX_COUNT'));
+            fwriteConstDef($rFile, 'PolygonOutput_MaximumTypes', getSetting('POLYGON_OUTPUT_MAX_TYPES'));
+            fwriteConstDef($rFile, 'Search_BatchMode', getSettingBool('SEARCH_BATCH_MODE'));
+            fwriteConstDef($rFile, 'Search_NameOnlySearchFrequencyThreshold', getSetting('SEARCH_NAME_ONLY_THRESHOLD'));
+            fwriteConstDef($rFile, 'Term_Normalization_Rules', getSetting('TERM_NORMALIZATION'));
+            fwriteConstDef($rFile, 'Use_Aux_Location_data', getSettingBool('USE_AUX_LOCATION_DATA'));
+            fwriteConstDef($rFile, 'Use_US_Tiger_Data', getSettingBool('USE_US_TIGER_DATA'));
+            fwriteConstDef($rFile, 'MapIcon_URL', getSetting('MAPICON_URL'));
+
+            // XXX scripts should go into the library.
+            fwrite($rFile, 'require_once(\''.CONST_DataDir.'/website/'.$sScript."');\n");
+            fclose($rFile);
+
+            chmod(CONST_InstallDir.'/website/'.$sScript, 0755);
+        }

     }
 
     /**
     }
 
     /**


@@ -755,11 +781,10 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
 
     private function removeFlatnodeFile()
     {
 
     private function removeFlatnodeFile()
     {

-        if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
-            if (file_exists(CONST_Osm2pgsql_Flatnode_File)) {
-                if ($this->bVerbose) echo 'Deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
-                unlink(CONST_Osm2pgsql_Flatnode_File);
-            }
+        $sFName = getSetting('FLATNODE_FILE');
+        if ($sFName && file_exists($sFName)) {
+            if ($this->bVerbose) echo 'Deleting '.$sFName."\n";
+            unlink($sFName);

         }
     }
 
         }
     }
 


@@ -775,43 +800,18 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
 
     private function createSqlFunctions()
     {
 
     private function createSqlFunctions()
     {

-        $sBasePath = CONST_BasePath.'/sql/functions/';
-        $sTemplate = file_get_contents($sBasePath.'utils.sql');
-        $sTemplate .= file_get_contents($sBasePath.'normalization.sql');
-        $sTemplate .= file_get_contents($sBasePath.'ranking.sql');
-        $sTemplate .= file_get_contents($sBasePath.'importance.sql');
-        $sTemplate .= file_get_contents($sBasePath.'address_lookup.sql');
-        $sTemplate .= file_get_contents($sBasePath.'interpolation.sql');
-        if ($this->db()->tableExists('place')) {
-            $sTemplate .= file_get_contents($sBasePath.'place_triggers.sql');
-        }
-        if ($this->db()->tableExists('placex')) {
-            $sTemplate .= file_get_contents($sBasePath.'placex_triggers.sql');
-        }
-        if ($this->db()->tableExists('location_postcode')) {
-            $sTemplate .= file_get_contents($sBasePath.'postcode_triggers.sql');
-        }
-        $sTemplate = str_replace('{modulepath}', $this->sModulePath, $sTemplate);
-        if ($this->bEnableDiffUpdates) {
-            $sTemplate = str_replace('RETURN NEW; -- %DIFFUPDATES%', '--', $sTemplate);
+        $oCmd = (clone($this->oNominatimCmd))
+                ->addParams('refresh', '--functions');
+
+        if (!$this->bEnableDiffUpdates) {
+            $oCmd->addParams('--no-diff-updates');

         }
         }

+

         if ($this->bEnableDebugStatements) {
         if ($this->bEnableDebugStatements) {

-            $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
-        }
-        if (CONST_Limit_Reindexing) {
-            $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
-        }
-        if (!CONST_Use_US_Tiger_Data) {
-            $sTemplate = str_replace('-- %NOTIGERDATA% ', '', $sTemplate);
+            $oCmd->addParams('--enable-debug-statements');

         }
         }

-        if (!CONST_Use_Aux_Location_data) {
-            $sTemplate = str_replace('-- %NOAUXDATA% ', '', $sTemplate);
-        }
-
-        $sReverseOnly = $this->dbReverseOnly() ? 'true' : 'false';
-        $sTemplate = str_replace('%REVERSE-ONLY%', $sReverseOnly, $sTemplate);

 
 

-        $this->pgsqlRunScript($sTemplate);
+        $oCmd->run();

     }
 
     private function pgsqlRunPartitionScript($sTemplate)
     }
 
     private function pgsqlRunPartitionScript($sTemplate)


@@ -895,15 +895,15 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
 
     private function replaceSqlPatterns($sSql)
     {
 
     private function replaceSqlPatterns($sSql)
     {

-        $sSql = str_replace('{www-user}', CONST_Database_Web_User, $sSql);
+        $sSql = str_replace('{www-user}', getSetting('DATABASE_WEBUSER'), $sSql);

 
         $aPatterns = array(
 
         $aPatterns = array(

-                      '{ts:address-data}' => CONST_Tablespace_Address_Data,
-                      '{ts:address-index}' => CONST_Tablespace_Address_Index,
-                      '{ts:search-data}' => CONST_Tablespace_Search_Data,
-                      '{ts:search-index}' =>  CONST_Tablespace_Search_Index,
-                      '{ts:aux-data}' =>  CONST_Tablespace_Aux_Data,
-                      '{ts:aux-index}' =>  CONST_Tablespace_Aux_Index,
+                      '{ts:address-data}' => getSetting('TABLESPACE_ADDRESS_DATA'),
+                      '{ts:address-index}' => getSetting('TABLESPACE_ADDRESS_INDEX'),
+                      '{ts:search-data}' => getSetting('TABLESPACE_SEARCH_DATA'),
+                      '{ts:search-index}' =>  getSetting('TABLESPACE_SEARCH_INDEX'),
+                      '{ts:aux-data}' =>  getSetting('TABLESPACE_AUX_DATA'),
+                      '{ts:aux-index}' =>  getSetting('TABLESPACE_AUX_INDEX')

         );
 
         foreach ($aPatterns as $sPattern => $sTablespace) {
         );
 
         foreach ($aPatterns as $sPattern => $sTablespace) {


@@ -939,4 +939,21 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
     {
         return !($this->db()->tableExists('search_name'));
     }
     {
         return !($this->db()->tableExists('search_name'));
     }

+
+    /**
+     * Try accessing the C module, so we know early if something is wrong.
+     *
+     * Raises Nominatim\DatabaseError on failure
+     */
+    private function checkModulePresence()
+    {
+        $sModulePath = getSetting('DATABASE_MODULE_PATH', CONST_InstallDir.'/module');
+        $sSQL = "CREATE FUNCTION nominatim_test_import_func(text) RETURNS text AS '";
+        $sSQL .= $sModulePath . "/nominatim.so', 'transliteration' LANGUAGE c IMMUTABLE STRICT";
+        $sSQL .= ';DROP FUNCTION nominatim_test_import_func(text);';
+
+        $oDB = new \Nominatim\DB();
+        $oDB->connect();
+        $oDB->exec($sSQL, null, 'Database server failed to load '.$sModulePath.'/nominatim.so module');
+    }

 }
 }