switch remaining settings to dotenv format

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 9b68ecdb35a51b586fad7aca0328fa6cfff241eb..7f9b7a2dc2c22405553a8ebc357579f7526c9e17 100644 (file)
--- a/utils/update.php
+++ b/utils/update.php
@@ -67,7 +67,7 @@ if ($iCacheMemory + 500 > getTotalMemoryMB()) {
     echo "WARNING: resetting cache memory to $iCacheMemory\n";
 }
 
     echo "WARNING: resetting cache memory to $iCacheMemory\n";
 }
 

-$oOsm2pgsqlCmd = (new \Nominatim\Shell(CONST_Osm2pgsql_Binary))
+$oOsm2pgsqlCmd = (new \Nominatim\Shell(getOsm2pgsqlBinary()))

                  ->addParams('--hstore')
                  ->addParams('--latlong')
                  ->addParams('--append')
                  ->addParams('--hstore')
                  ->addParams('--latlong')
                  ->addParams('--append')


@@ -77,7 +77,7 @@ $oOsm2pgsqlCmd = (new \Nominatim\Shell(CONST_Osm2pgsql_Binary))
                  ->addParams('--number-processes', 1)
                  ->addParams('--cache', $iCacheMemory)
                  ->addParams('--output', 'gazetteer')
                  ->addParams('--number-processes', 1)
                  ->addParams('--cache', $iCacheMemory)
                  ->addParams('--output', 'gazetteer')

-                 ->addParams('--style', CONST_Import_Style)
+                 ->addParams('--style', getImportStyle())

                  ->addParams('--database', $aDSNInfo['database'])
                  ->addParams('--port', $aDSNInfo['port']);
 
                  ->addParams('--database', $aDSNInfo['database'])
                  ->addParams('--port', $aDSNInfo['port']);
 


@@ -90,8 +90,8 @@ if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
 if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
     $oOsm2pgsqlCmd->addEnvPair('PGPASSWORD', $aDSNInfo['password']);
 }
 if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
     $oOsm2pgsqlCmd->addEnvPair('PGPASSWORD', $aDSNInfo['password']);
 }

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

 }
 if ($fPostgresVersion >= 11.0) {
     $oOsm2pgsqlCmd->addEnvPair(
 }
 if ($fPostgresVersion >= 11.0) {
     $oOsm2pgsqlCmd->addEnvPair(


@@ -121,31 +121,34 @@ if (isset($aDSNInfo['password']) && $aDSNInfo['password']) {
     $oIndexCmd->addEnvPair('PGPASSWORD', $aDSNInfo['password']);
 }
 
     $oIndexCmd->addEnvPair('PGPASSWORD', $aDSNInfo['password']);
 }
 

+$sPyosmiumBin = getSetting('PYOSMIUM_BINARY');
+$sBaseURL = getSetting('REPLICATION_URL');
+

 
 if ($aResult['init-updates']) {
     // sanity check that the replication URL is correct
 
 if ($aResult['init-updates']) {
     // sanity check that the replication URL is correct

-    $sBaseState = file_get_contents(CONST_Replication_Url.'/state.txt');
+    $sBaseState = file_get_contents($sBaseURL.'/state.txt');

     if ($sBaseState === false) {
         echo "\nCannot find state.txt file at the configured replication URL.\n";
         echo "Does the URL point to a directory containing OSM update data?\n\n";
         fail('replication URL not reachable.');
     }
     // sanity check for pyosmium-get-changes
     if ($sBaseState === false) {
         echo "\nCannot find state.txt file at the configured replication URL.\n";
         echo "Does the URL point to a directory containing OSM update data?\n\n";
         fail('replication URL not reachable.');
     }
     // sanity check for pyosmium-get-changes

-    if (!CONST_Pyosmium_Binary) {
-        echo "\nCONST_Pyosmium_Binary not configured.\n";
+    if (!$sPyosmiumBin) {
+        echo "\nNOMINATIM_PYOSMIUM_BINARY not configured.\n";

         echo "You need to install pyosmium and set up the path to pyosmium-get-changes\n";
         echo "You need to install pyosmium and set up the path to pyosmium-get-changes\n";

-        echo "in your local settings file.\n\n";
-        fail('CONST_Pyosmium_Binary not configured');
+        echo "in your local .env file.\n\n";
+        fail('NOMINATIM_PYOSMIUM_BINARY not configured');

     }
 
     $aOutput = 0;
     }
 
     $aOutput = 0;

-    $oCMD = new \Nominatim\Shell(CONST_Pyosmium_Binary, '--help');
+    $oCMD = new \Nominatim\Shell($sPyosmiumBin, '--help');

     exec($oCMD->escapedCmd(), $aOutput, $iRet);
 
     if ($iRet != 0) {
         echo "Cannot execute pyosmium-get-changes.\n";
         echo "Make sure you have pyosmium installed correctly\n";
     exec($oCMD->escapedCmd(), $aOutput, $iRet);
 
     if ($iRet != 0) {
         echo "Cannot execute pyosmium-get-changes.\n";
         echo "Make sure you have pyosmium installed correctly\n";

-        echo "and have set up CONST_Pyosmium_Binary to point to pyosmium-get-changes.\n";
+        echo "and have set up NOMINATIM_PYOSMIUM_BINARY to point to pyosmium-get-changes.\n";

         fail('pyosmium-get-changes not found or not usable');
     }
 
         fail('pyosmium-get-changes not found or not usable');
     }
 


@@ -166,9 +169,9 @@ if ($aResult['init-updates']) {
 
     // get the appropriate state id
     $aOutput = 0;
 
     // get the appropriate state id
     $aOutput = 0;

-    $oCMD = (new \Nominatim\Shell(CONST_Pyosmium_Binary))
+    $oCMD = (new \Nominatim\Shell($sPyosmiumBin))

             ->addParams('--start-date', $sWindBack)
             ->addParams('--start-date', $sWindBack)

-            ->addParams('--server', CONST_Replication_Url);
+            ->addParams('--server', $sBaseURL);

 
     exec($oCMD->escapedCmd(), $aOutput, $iRet);
     if ($iRet != 0 || $aOutput[0] == 'None') {
 
     exec($oCMD->escapedCmd(), $aOutput, $iRet);
     if ($iRet != 0 || $aOutput[0] == 'None') {


@@ -196,7 +199,7 @@ if ($aResult['check-for-updates']) {
     }
 
     $oCmd = (new \Nominatim\Shell(CONST_BinDir.'/check_server_for_updates.py'))
     }
 
     $oCmd = (new \Nominatim\Shell(CONST_BinDir.'/check_server_for_updates.py'))

-            ->addParams(CONST_Replication_Url)
+            ->addParams($sBaseURL)

             ->addParams($aLastState['sequence_id']);
     $iRet = $oCmd->run();
 
             ->addParams($aLastState['sequence_id']);
     $iRet = $oCmd->run();
 


@@ -293,8 +296,9 @@ if ($aResult['index']) {
 }
 
 if ($aResult['update-address-levels']) {
 }
 
 if ($aResult['update-address-levels']) {

-    echo 'Updating address levels from '.CONST_Address_Level_Config.".\n";
-    $oAlParser = new \Nominatim\Setup\AddressLevelParser(CONST_Address_Level_Config);
+    $sAddressLevelConfig = getSettingConfig('ADDRESS_LEVEL_CONFIG', 'address-levels.json');
+    echo 'Updating address levels from '.$sAddressLevelConfig.".\n";
+    $oAlParser = new \Nominatim\Setup\AddressLevelParser($sAddressLevelConfig);

     $oAlParser->createTable($oDB, 'address_levels');
 }
 
     $oAlParser->createTable($oDB, 'address_levels');
 }
 


@@ -317,17 +321,17 @@ if ($aResult['recompute-importance']) {
 
 if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
     //
 
 if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
     //

-    if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
+    if (strpos($sBaseURL, 'download.geofabrik.de') !== false && getSetting('REPLICATION_UPDATE_INTERVAL') < 86400) {

         fail('Error: Update interval too low for download.geofabrik.de. ' .
              "Please check install documentation (https://nominatim.org/release-docs/latest/admin/Import-and-Update#setting-up-the-update-process)\n");
     }
 
     $sImportFile = CONST_InstallDir.'/osmosischange.osc';
 
         fail('Error: Update interval too low for download.geofabrik.de. ' .
              "Please check install documentation (https://nominatim.org/release-docs/latest/admin/Import-and-Update#setting-up-the-update-process)\n");
     }
 
     $sImportFile = CONST_InstallDir.'/osmosischange.osc';
 

-    $oCMDDownload = (new \Nominatim\Shell(CONST_Pyosmium_Binary))
-                    ->addParams('--server', CONST_Replication_Url)
+    $oCMDDownload = (new \Nominatim\Shell($sPyosmiumBin))
+                    ->addParams('--server', $sBaseURL)

                     ->addParams('--outfile', $sImportFile)
                     ->addParams('--outfile', $sImportFile)

-                    ->addParams('--size', CONST_Replication_Max_Diff_size);
+                    ->addParams('--size', getSetting('REPLICATION_MAX_DIFF'));

 
     $oCMDImport = (clone $oOsm2pgsqlCmd)->addParams($sImportFile);
 
 
     $oCMDImport = (clone $oOsm2pgsqlCmd)->addParams($sImportFile);
 


@@ -347,7 +351,7 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
 
         if ($aLastState['indexed']) {
             // Sleep if the update interval has not yet been reached.
 
         if ($aLastState['indexed']) {
             // Sleep if the update interval has not yet been reached.

-            $fNextUpdate = $aLastState['unix_ts'] + CONST_Replication_Update_Interval;
+            $fNextUpdate = $aLastState['unix_ts'] + getSetting('REPLICATION_UPDATE_INTERVAL');

             if ($fNextUpdate > $fStartTime) {
                 $iSleepTime = $fNextUpdate - $fStartTime;
                 echo "Waiting for next update for $iSleepTime sec.";
             if ($fNextUpdate > $fStartTime) {
                 $iSleepTime = $fNextUpdate - $fStartTime;
                 echo "Waiting for next update for $iSleepTime sec.";


@@ -368,8 +372,9 @@ if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) {
                 exec($oCMD->escapedCmd(), $aOutput, $iResult);
 
                 if ($iResult == 3) {
                 exec($oCMD->escapedCmd(), $aOutput, $iResult);
 
                 if ($iResult == 3) {

-                    echo 'No new updates. Sleeping for '.CONST_Replication_Recheck_Interval." sec.\n";
-                    sleep(CONST_Replication_Recheck_Interval);
+                    $sSleep = getSetting('REPLICATION_RECHECK_INTERVAL');
+                    echo 'No new updates. Sleeping for '.$sSleep." sec.\n";
+                    sleep($sSleep);

                 } elseif ($iResult != 0) {
                     echo 'ERROR: updates failed.';
                     exit($iResult);
                 } elseif ($iResult != 0) {
                     echo 'ERROR: updates failed.';
                     exit($iResult);