From 00d1abc99263eb04f5b421d495e44674a1a86b63 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Wed, 13 Mar 2024 02:56:32 +0100 Subject: [PATCH] cron --- init-server.py | 8 +++++--- ssh_lib/tasks.py | 5 +---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/init-server.py b/init-server.py index 156c10d..ab5f316 100755 --- a/init-server.py +++ b/init-server.py @@ -3,9 +3,8 @@ import click from fabric import Config, Connection -from ssh_lib import dotenv_val +from ssh_lib import SCRIPTS_DIR, dotenv_val from ssh_lib.tasks import ( - add_http_host_cron, prepare_http_host, prepare_shared, prepare_tile_gen, @@ -15,6 +14,7 @@ from ssh_lib.tasks import ( upload_http_host_files, ) from ssh_lib.utils import ( + put, sudo_cmd, ) @@ -67,6 +67,7 @@ def http_host_once(hostname, user, port): upload_http_host_config(c) prepare_http_host(c) + run_http_host_sync(c) @@ -82,7 +83,8 @@ def http_host_autoupdate(hostname, user, port): upload_http_host_config(c) prepare_http_host(c) - add_http_host_cron(c) + + put(c, SCRIPTS_DIR / 'http_host' / 'cron.d' / 'ofm_http_host', '/etc/cron.d/') @cli.command() diff --git a/ssh_lib/tasks.py b/ssh_lib/tasks.py index 5547048..30c7715 100644 --- a/ssh_lib/tasks.py +++ b/ssh_lib/tasks.py @@ -134,6 +134,7 @@ def upload_http_host_config(c): f'{REMOTE_CONFIG}/rclone.conf', permissions=400, ) + put(c, SCRIPTS_DIR / 'http_host' / 'cron.d' / 'ofm_ledns_reader', '/etc/cron.d/') def prepare_http_host(c): @@ -154,10 +155,6 @@ def prepare_http_host(c): c.sudo('/data/ofm/venv/bin/pip install -e /data/ofm/http_host/bin') -def add_http_host_cron(c): - put(c, SCRIPTS_DIR / 'http_host' / 'cron.d' / 'ofm_http_host', '/etc/cron.d/') - - def run_http_host_sync(c): sudo_cmd(c, '/data/ofm/venv/bin/python -u /data/ofm/http_host/bin/host_manager.py sync')