From f218e20522085086f8d84006a9fb2b084fa96ec4 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 20 Dec 2020 11:35:29 +0100
Subject: [PATCH] mark CentOS installation instructions as broken

Getting symfony-dotenv installed on CentOS is a major pain,
so just mark it broken instead.

Still sSwitch the config format to dotenv already.
---
 vagrant/Install-on-Centos-7.sh |  9 +++++----
 vagrant/Install-on-Centos-8.sh | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index c67aab7c..24b17663 100755
--- 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:
 #
@@ -189,10 +193,7 @@ fi                                 #DOCS:
 # the name of your webserver user:
 
 #DOCS:```sh
-tee settings/local.php << EOF
-<?php
- @define('CONST_Database_Web_User', 'apache');
-EOF
+echo NOMINATIM_DATABASE_WEBUSER="apache" | tee .env
 #DOCS:```
 
 
diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh
index 8559726b..517a5156 100755
--- a/vagrant/Install-on-Centos-8.sh
+++ b/vagrant/Install-on-Centos-8.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 8.
 # Make sure all packages are up-to-date by running:
 #
@@ -26,7 +30,7 @@
 # Now you can install all packages needed for Nominatim:
 
 #DOCS:    :::sh
-    sudo dnf --enablerepo=PowerTools install -y postgresql12-server \
+    sudo dnf --enablerepo=powertools install -y postgresql12-server \
                         postgresql12-contrib postgresql12-devel postgis30_12 \
                         wget git cmake make gcc gcc-c++ libtool policycoreutils-python-utils \
                         llvm-toolset ccache clang-tools-extra \
@@ -183,10 +187,7 @@ fi                                 #DOCS:
 # the name of your webserver user:
 
 #DOCS:```sh
-tee settings/local.php << EOF
-<?php
- @define('CONST_Database_Web_User', 'apache');
-EOF
+echo NOMINATIM_DATABASE_WEBUSER="apache" | tee .env
 #DOCS:```
 
 
-- 
2.45.1