From 23e39704f401eb29b362ad612217bc0ea5fee4df Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Sun, 3 Mar 2024 00:54:28 +0100 Subject: [PATCH] ledns rename --- config/.env.sample | 2 +- init-server.py | 6 +++--- ssh_lib/tasks.py | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/.env.sample b/config/.env.sample index 1a09ee4..b45ee2f 100644 --- a/config/.env.sample +++ b/config/.env.sample @@ -16,5 +16,5 @@ SKIP_PLANET=false # --- Let's Encrypt DNS related variables, not needed for self-hosting -DOMAIN_LE_DNS = rr.openfreemap.org +DOMAIN_LEDNS = rr.openfreemap.org diff --git a/init-server.py b/init-server.py index 78b31a6..d9e1125 100755 --- a/init-server.py +++ b/init-server.py @@ -10,7 +10,7 @@ from ssh_lib.tasks import ( prepare_shared, prepare_tile_gen, run_http_host_sync, - setup_le_dns_manager, + setup_ledns_manager, upload_http_host_config, ) from ssh_lib.utils import ( @@ -98,13 +98,13 @@ def tile_gen(hostname, user, port): @cli.command() @common_options -def le_dns_manager(hostname, user, port): +def ledns_manager(hostname, user, port): if not click.confirm(f'Run script on {hostname}?'): return c = get_connection(hostname, user, port) - setup_le_dns_manager(c) + setup_ledns_manager(c) @cli.command() diff --git a/ssh_lib/tasks.py b/ssh_lib/tasks.py index 5575d68..d3f24bd 100644 --- a/ssh_lib/tasks.py +++ b/ssh_lib/tasks.py @@ -178,18 +178,18 @@ def install_benchmark(c): wrk(c) -def setup_le_dns_manager(c): +def setup_ledns_manager(c): le_email = dotenv_val('LE_EMAIL').lower() - domain_le_dns = dotenv_val('DOMAIN_LE_DNS').lower() + domain_ledns = dotenv_val('DOMAIN_LEDNS').lower() assert le_email - assert domain_le_dns + assert domain_ledns c.sudo('mkdir -p /root/.secrets') put( c, CONFIG_DIR / 'cloudflare.ini', - '/root/.secrets/ofm_le_dns_cloudflare.ini', + '/root/.secrets/ofm_ledns_cloudflare.ini', permissions=400, ) @@ -199,11 +199,11 @@ def setup_le_dns_manager(c): c, 'certbot certonly ' '--dns-cloudflare ' - '--dns-cloudflare-credentials /root/.secrets/ofm_le_dns_cloudflare.ini ' + '--dns-cloudflare-credentials /root/.secrets/ofm_ledns_cloudflare.ini ' '--dns-cloudflare-propagation-seconds 60 ' '--staging ' f'--noninteractive -m {le_email} ' f'--agree-tos ' - f'--cert-name=ofm_le_dns ' - f'-d {domain_le_dns}', + f'--cert-name=ofm_ledns ' + f'-d {domain_ledns}', )