mirror of
https://github.com/hyperknot/openfreemap.git
synced 2026-05-21 14:02:15 +00:00
certs
This commit is contained in:
@@ -9,7 +9,7 @@ from fabric import Config, Connection
|
||||
from ssh_lib import CONFIG_DIR, HTTP_HOST_BIN, OFM_DIR, REMOTE_CONFIG, SCRIPTS_DIR, TILE_GEN_BIN
|
||||
from ssh_lib.benchmark import c1000k, wrk
|
||||
from ssh_lib.kernel import kernel_tweaks_ofm
|
||||
from ssh_lib.nginx import lego, nginx
|
||||
from ssh_lib.nginx import certbot, lego, nginx
|
||||
from ssh_lib.pkg_base import pkg_base, pkg_upgrade
|
||||
from ssh_lib.planetiler import planetiler
|
||||
from ssh_lib.rclone import rclone
|
||||
@@ -97,11 +97,12 @@ def prepare_tile_gen(c):
|
||||
|
||||
|
||||
def upload_http_host_config(c):
|
||||
domain_le = dotenv_values(f'{CONFIG_DIR}/.env').get('DOMAIN_LE', '').strip()
|
||||
domain_cf = dotenv_values(f'{CONFIG_DIR}/.env').get('DOMAIN_CF', '').strip()
|
||||
skip_planet = (
|
||||
dotenv_values(f'{CONFIG_DIR}/.env').get('SKIP_PLANET', '').lower().strip() == 'true'
|
||||
)
|
||||
env_values = dotenv_values(f'{CONFIG_DIR}/.env')
|
||||
|
||||
domain_le = env_values.get('DOMAIN_LE', '').strip()
|
||||
domain_cf = env_values.get('DOMAIN_CF', '').strip()
|
||||
skip_planet = env_values.get('SKIP_PLANET', '').lower().strip() == 'true'
|
||||
le_email = env_values.get('LE_EMAIL', '').strip()
|
||||
|
||||
if not (domain_le or domain_cf):
|
||||
sys.exit('Please specify DOMAIN_LE or DOMAIN_CF in config/.env')
|
||||
@@ -117,6 +118,7 @@ def upload_http_host_config(c):
|
||||
'domain_le': domain_le,
|
||||
'domain_cf': domain_cf,
|
||||
'skip_planet': skip_planet,
|
||||
'le_email': le_email,
|
||||
}
|
||||
|
||||
host_config_str = json.dumps(host_config, indent=2, ensure_ascii=False)
|
||||
@@ -126,7 +128,7 @@ def upload_http_host_config(c):
|
||||
|
||||
def prepare_http_host(c):
|
||||
nginx(c)
|
||||
lego(c)
|
||||
certbot(c)
|
||||
|
||||
c.sudo('rm -rf /data/ofm/http_host/logs')
|
||||
c.sudo('mkdir -p /data/ofm/http_host/logs')
|
||||
@@ -260,14 +262,12 @@ def tile_gen(hostname, user, port):
|
||||
def debug(hostname, user, port):
|
||||
c = get_connection(hostname, user, port)
|
||||
|
||||
lego(c)
|
||||
upload_http_host_config(c)
|
||||
|
||||
# upload_http_host_config(c)
|
||||
upload_https_host_files(c)
|
||||
|
||||
# upload_https_host_files(c)
|
||||
# run_http_host_sync(c)
|
||||
|
||||
# sudo_cmd(c, '/data/ofm/venv/bin/python -u /data/ofm/http_host/bin/host_manager.py nginx-sync')
|
||||
sudo_cmd(c, '/data/ofm/venv/bin/python -u /data/ofm/http_host/bin/host_manager.py nginx-sync')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Reference in New Issue
Block a user