replace Symfony dotenv dependency with Python dotenv

diff --git a/docs/admin/Import.md b/docs/admin/Import.md
index 1fdeb0e3ff7c163003af964a597fa6e987a4b0cc..01d012305927ad27c8c87eb858058fb15e71c62c 100644 (file)
--- a/docs/admin/Import.md
+++ b/docs/admin/Import.md
@@ -8,7 +8,7 @@ software itself, if not return to the [installation page](Installation.md).
 ## Configuration setup in `.env`
 
 The Nominatim server can be customized via a `.env` in the build directory.
-This is a file in [dotenv](https://symfony.com/doc/4.3/components/dotenv.html) format
+This is a file in [dotenv](https://github.com/theskumar/python-dotenv) format
 which looks the same as variable settings in a standard shell environment.
 You can also set the same configuration via environment variables. All
 settings have a `NOMINATIM_` prefix to avoid conflicts with other environment

diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md
index a577fdcfabfb7ce31a16e0f33ae7aba4dcd818a5..c9d000b22ae8b85c05f22c5cb9a7c3f8507f5249 100644 (file)
--- a/docs/admin/Installation.md
+++ b/docs/admin/Installation.md
@@ -38,12 +38,12 @@ For running Nominatim:
 
   * [PostgreSQL](https://www.postgresql.org) (9.3+)
   * [PostGIS](https://postgis.net) (2.2+)
-  * [Python 3](https://www.python.org/)
+  * [Python 3](https://www.python.org/) (3.4+)
   * [Psycopg2](https://www.psycopg.org)
   * [PHP](https://php.net) (7.0 or later)
   * PHP-pgsql
   * PHP-intl (bundled with PHP)
-  * [PHP Symphony Dotenv](https://symfony.com/doc/4.3/components/dotenv.html)
+  * [Python Dotenv](https://github.com/theskumar/python-dotenv)
 
 For running continuous updates:
 

diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index 24b1766330141e56ed50e8fe213c494b33685389..009152727e3cb7b9150865778ad4023030ddbf5e 100755 (executable)
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -6,10 +6,6 @@
 # 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:
 #
@@ -46,7 +42,7 @@
                         python3-pip python3-setuptools python3-devel \
                         expat-devel zlib-devel
 
-    pip3 install --user psycopg2
+    pip3 install --user psycopg2 python-dotenv
 
 
 #

diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh
index 517a5156111ec738f1d3f98d1794d819795d7533..548f8c9caf76d33a3dab14c2ee6bac1655b3e1be 100755 (executable)
--- a/vagrant/Install-on-Centos-8.sh
+++ b/vagrant/Install-on-Centos-8.sh
@@ -6,10 +6,6 @@
 # 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:
 #
@@ -39,7 +35,7 @@
                         python3-pip python3-setuptools python3-devel \
                         expat-devel zlib-devel
 
-    pip3 install --user psycopg2
+    pip3 install --user psycopg2 python-dotenv
 
 
 #

diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh
index e7233114060d889f99177068ad450a55ad04f07a..8a4d2b7385d940a79ef7eed654054ba08dd206b8 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-18.sh
+++ b/vagrant/Install-on-Ubuntu-18.sh
@@ -29,7 +29,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                         libbz2-dev libpq-dev libproj-dev \
                         postgresql-server-dev-10 postgresql-10-postgis-2.4 \
                         postgresql-contrib-10 postgresql-10-postgis-scripts \
-                        php php-pgsql php-intl php-symfony-dotenv \
+                        php php-pgsql php-intl python3-dotenv \
                         python3-psycopg2 git
 
 

diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh
index 292714e96e3da37738c79a25a6694f3b155b6037..94afca784428e4644452f9b19e9f3c6aaffd6629 100644 (file)
--- a/vagrant/Install-on-Ubuntu-20.sh
+++ b/vagrant/Install-on-Ubuntu-20.sh
@@ -32,7 +32,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                         libbz2-dev libpq-dev libproj-dev \
                         postgresql-server-dev-12 postgresql-12-postgis-3 \
                         postgresql-contrib-12 postgresql-12-postgis-3-scripts \
-                        php php-pgsql php-intl php-symfony-dotenv \
+                        php php-pgsql php-intl python3-dotenv \
                         python3-psycopg2 git
 
 #