Merge remote-tracking branch 'upstream/master'

[nominatim.git] / vagrant / Install-on-Centos-7.sh

diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index f26c567c8eaf4bcbe4a152120a1ed120a9a121e9..24b1766330141e56ed50e8fe213c494b33685389 100755 (executable)
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -6,6 +6,10 @@
 # Installing the Required Software
 # ================================
 #
+# !!! caution
+#     These instructions are currently broken because they do not
+#     include installation of the required PHP library symfony-dotenv.
+#
 # These instructions expect that you have a freshly installed CentOS version 7.
 # Make sure all packages are up-to-date by running:
 #
@@ -186,14 +190,10 @@ fi                                 #DOCS:
 
 
 # You need to create a minimal configuration file that tells nominatim
-# the name of your webserver user and the URL of the website:
+# the name of your webserver user:
 
 #DOCS:```sh
-tee settings/local.php << EOF
-<?php
- @define('CONST_Database_Web_User', 'apache');
- @define('CONST_Website_BaseURL', '/nominatim/');
-EOF
+echo NOMINATIM_DATABASE_WEBUSER="apache" | tee .env
 #DOCS:```