sysadmin/openfreemap
1
0
Fork 0
mirror of https://github.com/hyperknot/openfreemap.git synced 2026-05-21 14:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

variable env file handling

Browse Source
This commit is contained in:
Zsolt Ero
2024-10-23 23:21:38 +02:00
parent fb44bb0241
commit e800123093
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/.env.sample
View File

@@ -7,8 +7,6 @@ DOMAIN_LE=
# Let's Encrypt account email # Let's Encrypt account email
LE_EMAIL= LE_EMAIL=
# Skip the full planet download, useful for testing (true/false) # Skip the full planet download, useful for testing (true/false)
SKIP_PLANET=false SKIP_PLANET=false

15
ssh_lib/__init__.py
View File

@@ -1,3 +1,5 @@
import os
import sys
from pathlib import Path from pathlib import Path
from dotenv import dotenv_values from dotenv import dotenv_values
@@ -19,7 +21,18 @@ PLANETILER_BIN = f'{TILE_GEN_DIR}/planetiler'
HTTP_HOST_BIN = f'{OFM_DIR}/http_host/bin' HTTP_HOST_BIN = f'{OFM_DIR}/http_host/bin'
DOTENV_VALUES = dotenv_values(f'{CONFIG_DIR}/.env')
ENV = os.getenv('ENV')
if ENV:
env_file_name = f'.env.{ENV}'
else:
env_file_name = '.env'
env_file_path = CONFIG_DIR / env_file_name
if not env_file_path.exists():
sys.exit(f'config/{env_file_name} does not exist')
DOTENV_VALUES = dotenv_values(CONFIG_DIR / env_file_name)
def dotenv_val(key): def dotenv_val(key):

3
ssh_lib/tasks.py
View File

@@ -209,7 +209,7 @@ def upload_config_json(c):
if not (domain_le or domain_ledns): if not (domain_le or domain_ledns):
sys.exit('Please specify DOMAIN_LE or DOMAIN_LEDNS in config/.env') sys.exit('Please specify DOMAIN_LE or DOMAIN_LEDNS in config/.env')
if domain_le and not le_email: if domain_le and not le_email and not skip_letsencrypt:
sys.exit('Please add your email to LE_EMAIL when using DOMAIN_LE') sys.exit('Please add your email to LE_EMAIL when using DOMAIN_LE')
http_host_list = [h.strip() for h in dotenv_val('HTTP_HOST_LIST').split(',') if h.strip()] http_host_list = [h.strip() for h in dotenv_val('HTTP_HOST_LIST').split(',') if h.strip()]
@@ -219,6 +219,7 @@ def upload_config_json(c):
'domain_ledns': domain_ledns, 'domain_ledns': domain_ledns,
'le_email': le_email, 'le_email': le_email,
'skip_planet': skip_planet, 'skip_planet': skip_planet,
'skip_letsencrypt': skip_letsencrypt,
'http_host_list': http_host_list, 'http_host_list': http_host_list,
'telegram_token': dotenv_val('TELEGRAM_TOKEN'), 'telegram_token': dotenv_val('TELEGRAM_TOKEN'),
'telegram_chat_id': dotenv_val('TELEGRAM_CHAT_ID'), 'telegram_chat_id': dotenv_val('TELEGRAM_CHAT_ID'),