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

introduce constant for configuration directory

Browse Source 
This replaces {data_dir}/settings throughout the code, so that
the configuration may be placed somewhere else in the directory
structure (e.g. in /etc).
This commit is contained in:
Sarah Hoffmann
2021-02-09 18:45:45 +01:00
parent b9517c99ae
commit 298ed11261
8 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nominatim/cli.py
View File

@@ -69,7 +69,7 @@ class CommandlineParser:
return 1
for arg in ('module_dir', 'osm2pgsql_path', 'phplib_dir', 'sqllib_dir',
'data_dir', 'phpcgi_path'):
'data_dir', 'config_dir', 'phpcgi_path'):
setattr(args, arg, Path(kwargs[arg]))
args.project_dir = Path(args.project_dir).resolve()
@@ -78,7 +78,7 @@ class CommandlineParser:
datefmt='%Y-%m-%d %H:%M:%S',
level=max(4 - args.verbose, 1) * 10)
args.config = Configuration(args.project_dir, args.data_dir / 'settings')
args.config = Configuration(args.project_dir, args.config_dir)
log = logging.getLogger()
log.warning('Using project directory: %s', str(args.project_dir))