From 3dd67083b27f996b55a4a359198109cfd6f15b4e Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 14 Jan 2021 18:31:18 +0100 Subject: [PATCH] replace Symfony dotenv dependency with Python dotenv --- docs/admin/Import.md | 2 +- docs/admin/Installation.md | 4 ++-- vagrant/Install-on-Centos-7.sh | 6 +----- vagrant/Install-on-Centos-8.sh | 6 +----- vagrant/Install-on-Ubuntu-18.sh | 2 +- vagrant/Install-on-Ubuntu-20.sh | 2 +- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/docs/admin/Import.md b/docs/admin/Import.md index 1fdeb0e3..01d01230 100644 --- 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 a577fdcf..c9d000b2 100644 --- 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 24b17663..00915272 100755 --- 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 517a5156..548f8c9c 100755 --- 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 e7233114..8a4d2b73 100755 --- 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 292714e9..94afca78 100644 --- 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 # -- 2.45.1