hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

move dotenv parsing to installed PHP scripts

Browse Source 
This means that the php-symfony-dotenv library is now only needed
when using the legacy scripts. This includes the BDD tests which
currently still rely on the PHP utils.
This commit is contained in:
Sarah Hoffmann
2021-01-14 17:09:22 +01:00
parent 97710ee9d1
commit 9348fc5e15
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/build-nominatim/action.yml vendored
View File

@@ -6,7 +6,7 @@ runs:
steps: steps:
- name: Install prerequisits - name: Install prerequisits
run: | run: |
sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium php-symfony-dotenv python3-dotenv sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium python3-dotenv
shell: bash shell: bash
- name: Configure - name: Configure
@@ -16,7 +16,7 @@ runs:
- name: Build - name: Build
run: | run: |
make -j2 all make -j2 all
./utils/setup.php --setup-website ./nominatim refresh --website
shell: bash shell: bash
working-directory: build working-directory: build

2
.github/workflows/ci-tests.yml vendored
View File

@@ -47,7 +47,7 @@ jobs:
- name: Install test prerequsites - name: Install test prerequsites
run: | run: |
sudo apt-get install -y -qq php-codesniffer python3-tidylib sudo apt-get install -y -qq php-codesniffer python3-tidylib php-symfony-dotenv
sudo pip3 install behave sudo pip3 install behave
- name: PHP linting - name: PHP linting

4
cmake/script.tmpl
View File

@@ -1,8 +1,12 @@
#!@PHP_BIN@ -Cq #!@PHP_BIN@ -Cq
<?php <?php
require('@CMAKE_SOURCE_DIR@/lib/dotenv_loader.php');
@define('CONST_Default_ModulePath', '@CMAKE_BINARY_DIR@/module'); @define('CONST_Default_ModulePath', '@CMAKE_BINARY_DIR@/module');
@define('CONST_Default_Osm2pgsql', '@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql'); @define('CONST_Default_Osm2pgsql', '@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql');
@define('CONST_BinDir', '@CMAKE_SOURCE_DIR@/utils'); @define('CONST_BinDir', '@CMAKE_SOURCE_DIR@/utils');
@define('CONST_DataDir', '@CMAKE_SOURCE_DIR@'); @define('CONST_DataDir', '@CMAKE_SOURCE_DIR@');
loadDotEnv();
require_once('@CMAKE_SOURCE_DIR@/lib/admin/@script_source@'); require_once('@CMAKE_SOURCE_DIR@/lib/admin/@script_source@');

13
lib/dotenv_loader.php Normal file
View File

@@ -0,0 +1,13 @@
<?php
require('Symfony/Component/Dotenv/autoload.php');
function loadDotEnv()
{
$dotenv = new \Symfony\Component\Dotenv\Dotenv();
$dotenv->load(CONST_DataDir.'/settings/env.defaults');
if (file_exists('.env')) {
$dotenv->load('.env');
}
}

9
lib/lib.php
View File

@@ -1,7 +1,5 @@
<?php <?php
require('Symfony/Component/Dotenv/autoload.php');
function loadSettings($sProjectDir) function loadSettings($sProjectDir)
{ {
@define('CONST_InstallDir', $sProjectDir); @define('CONST_InstallDir', $sProjectDir);
@@ -10,13 +8,6 @@ function loadSettings($sProjectDir)
// set of settings. // set of settings.
defined('CONST_DataDir') or define('CONST_DataDir', $_SERVER['NOMINATIM_DATADIR']); defined('CONST_DataDir') or define('CONST_DataDir', $_SERVER['NOMINATIM_DATADIR']);
defined('CONST_BinDir') or define('CONST_BinDir', $_SERVER['NOMINATIM_BINDIR']); defined('CONST_BinDir') or define('CONST_BinDir', $_SERVER['NOMINATIM_BINDIR']);
$dotenv = new \Symfony\Component\Dotenv\Dotenv();
$dotenv->load(CONST_DataDir.'/settings/env.defaults');
if (file_exists($sProjectDir.'/.env')) {
$dotenv->load($sProjectDir.'/.env');
}
} }
function getSetting($sConfName, $sDefault = null) function getSetting($sConfName, $sDefault = null)