Moved settings-frontend to website/

diff --git a/cmake/website.tmpl b/cmake/website.tmpl
index c5173956543b0b841ce5cbb28b58c6664557ac5b..8692280d41a4026f55095d0772c9de301e771696 100755 (executable)
--- a/cmake/website.tmpl
+++ b/cmake/website.tmpl
@@ -1,3 +1,3 @@
 <?php
-require_once(dirname(dirname(__FILE__)).'/settings/settings-frontend.php');
+require_once(dirname(dirname(__FILE__)).'/website/settings-frontend.php');
 require_once(CONST_BasePath.'/@script_source@');

diff --git a/docs/admin/Import.md b/docs/admin/Import.md
index 0820a2ff18b0f5c88e479cad43700da679912581..b3b5448c83d864e60ba01e2fd4f71b88858f9037 100644 (file)
--- a/docs/admin/Import.md
+++ b/docs/admin/Import.md
@@ -197,7 +197,7 @@ Run this script to verify all required tables and indices got created successful
 
 ### Setting up the website
 
-Run the following command to set up the `settings/settings-frontend.php`.
+Run the following command to set up the `website/settings-frontend.php`.
 These settings are used in website/*.php files. You can use the website only after this 
 step is completed.
 

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index 38776a12118e477f908b3801a545c4fdaf216cdd..16c4872982a0413d039c205153164a6510287ab7 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -695,17 +695,13 @@ class SetupFunctions
     }
 
     /**
-     * Setup settings_test.php in the build/settings directory from build/.env file
+     * Setup settings-frontend.php in the build/website directory
      *
      * @return null
      */
     public function setupWebsite()
     {
-        $rOutputFile = fopen(CONST_InstallPath.'/settings/settings-frontend.php', 'w');
-
-        // Currently using CONST_BasePath and CONST_InstallPath.
-        // Once dotenv is setup, getenv() can be used, or another
-        // alternate option is to build settings_test.php using cmake.
+        $rOutputFile = fopen(CONST_InstallPath.'/website/settings-frontend.php', 'w');
 
         fwrite($rOutputFile, "<?php
 @define('CONST_BasePath', '".CONST_BasePath."');
@@ -734,7 +730,7 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
 @define('CONST_Use_US_Tiger_Data', ".(CONST_Use_US_Tiger_Data ? 'true' : 'false').");
 @define('CONST_Website_BaseURL', '".CONST_Website_BaseURL."');
 ");
-        info(CONST_InstallPath.'/settings/settings-frontend.php has been set up successfully');
+        info(CONST_InstallPath.'/website/settings-frontend.php has been set up successfully');
     }
 
     private function removeFlatnodeFile()