From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 18 Jul 2020 09:02:07 +0000 (+0200)
Subject: move website settings back to settings/
X-Git-Tag: v3.6.0~110^2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/3efe0dc8dced132d1864ea975db0128f3922b814

move website settings back to settings/

We don't want the settings to become visible when a server is
accidentally configured wrongly.
---

diff --git a/cmake/website.tmpl b/cmake/website.tmpl
index 8b946584..268ded39 100755
--- a/cmake/website.tmpl
+++ b/cmake/website.tmpl
@@ -1,5 +1,5 @@
 <?php
 @define('CONST_Debug', (isset($_GET['debug']) && $_GET['debug']));
-require_once(dirname(dirname(__FILE__)).'/website/settings-frontend.php');
+require_once(dirname(dirname(__FILE__)).'/settings/settings-frontend.php');
 
 require_once(CONST_BasePath.'/@script_source@');
diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index 8da0b106..cd620902 100755
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -701,7 +701,7 @@ class SetupFunctions
      */
     public function setupWebsite()
     {
-        $rOutputFile = fopen(CONST_InstallPath.'/website/settings-frontend.php', 'w');
+        $rOutputFile = fopen(CONST_InstallPath.'/settings/settings-frontend.php', 'w');
 
         fwrite($rOutputFile, "<?php
 @define('CONST_BasePath', '".CONST_BasePath."');