replace Symfony dotenv dependency with Python dotenv

This commit is contained in:
Sarah Hoffmann
2021-01-14 18:31:18 +01:00
parent 2f73bb3643
commit 3dd67083b2
6 changed files with 7 additions and 15 deletions

View File

@@ -8,7 +8,7 @@ software itself, if not return to the [installation page](Installation.md).
## Configuration setup in `.env` ## Configuration setup in `.env`
The Nominatim server can be customized via a `.env` in the build directory. 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. which looks the same as variable settings in a standard shell environment.
You can also set the same configuration via environment variables. All You can also set the same configuration via environment variables. All
settings have a `NOMINATIM_` prefix to avoid conflicts with other environment settings have a `NOMINATIM_` prefix to avoid conflicts with other environment

View File

@@ -38,12 +38,12 @@ For running Nominatim:
* [PostgreSQL](https://www.postgresql.org) (9.3+) * [PostgreSQL](https://www.postgresql.org) (9.3+)
* [PostGIS](https://postgis.net) (2.2+) * [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) * [Psycopg2](https://www.psycopg.org)
* [PHP](https://php.net) (7.0 or later) * [PHP](https://php.net) (7.0 or later)
* PHP-pgsql * PHP-pgsql
* PHP-intl (bundled with PHP) * 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: For running continuous updates:

View File

@@ -6,10 +6,6 @@
# Installing the Required Software # 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. # These instructions expect that you have a freshly installed CentOS version 7.
# Make sure all packages are up-to-date by running: # Make sure all packages are up-to-date by running:
# #
@@ -46,7 +42,7 @@
python3-pip python3-setuptools python3-devel \ python3-pip python3-setuptools python3-devel \
expat-devel zlib-devel expat-devel zlib-devel
pip3 install --user psycopg2 pip3 install --user psycopg2 python-dotenv
# #

View File

@@ -6,10 +6,6 @@
# Installing the Required Software # 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. # These instructions expect that you have a freshly installed CentOS version 8.
# Make sure all packages are up-to-date by running: # Make sure all packages are up-to-date by running:
# #
@@ -39,7 +35,7 @@
python3-pip python3-setuptools python3-devel \ python3-pip python3-setuptools python3-devel \
expat-devel zlib-devel expat-devel zlib-devel
pip3 install --user psycopg2 pip3 install --user psycopg2 python-dotenv
# #

View File

@@ -29,7 +29,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
libbz2-dev libpq-dev libproj-dev \ libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-10 postgresql-10-postgis-2.4 \ postgresql-server-dev-10 postgresql-10-postgis-2.4 \
postgresql-contrib-10 postgresql-10-postgis-scripts \ 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 python3-psycopg2 git

View File

@@ -32,7 +32,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
libbz2-dev libpq-dev libproj-dev \ libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-12 postgresql-12-postgis-3 \ postgresql-server-dev-12 postgresql-12-postgis-3 \
postgresql-contrib-12 postgresql-12-postgis-3-scripts \ 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 python3-psycopg2 git
# #