From 0bd2a19d1c4bae078b540be423598e4ce49c632d Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Tue, 10 Sep 2024 01:14:37 +0200 Subject: [PATCH] tile_gen fixes --- modules/tile_gen/cron.d/ofm_tile_gen | 9 ++++++++- modules/tile_gen/setup.py | 2 ++ modules/tile_gen/tile_gen_lib/host_check.py | 0 ssh_lib/tasks.py | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) delete mode 100644 modules/tile_gen/tile_gen_lib/host_check.py diff --git a/modules/tile_gen/cron.d/ofm_tile_gen b/modules/tile_gen/cron.d/ofm_tile_gen index 71c80e8..fd0ee06 100644 --- a/modules/tile_gen/cron.d/ofm_tile_gen +++ b/modules/tile_gen/cron.d/ofm_tile_gen @@ -1,5 +1,12 @@ # every hour, make a monaco run -10 * * * * ofm sudo /data/ofm/venv/bin/python -u /data/ofm/tile_gen/bin/tile_gen.py make-tiles monaco --upload >> /data/ofm/tile_gen/logs/monaco-cron.log 2>&1 +10 * * * * ofm sudo /data/ofm/venv/bin/python -u /data/ofm/tile_gen/bin/tile_gen.py make-tiles monaco --upload >> /data/ofm/tile_gen/logs/monaco-make-tiles.log 2>&1 + +# every minute, set monaco to latest +* * * * * ofm sudo /data/ofm/venv/bin/python -u /data/ofm/tile_gen/bin/tile_gen.py tile_gen.py set-version monaco >> /data/ofm/tile_gen/logs/monaco-set-version.log 2>&1 + +# every Tuesday morning at 00:10, make a planet run +10 0 * * 2 ofm sudo /data/ofm/venv/bin/python -u /data/ofm/tile_gen/bin/tile_gen.py make-tiles planet --upload >> /data/ofm/tile_gen/logs/planet-make-tiles.log 2>&1 + diff --git a/modules/tile_gen/setup.py b/modules/tile_gen/setup.py index 44bebe8..b0aa452 100644 --- a/modules/tile_gen/setup.py +++ b/modules/tile_gen/setup.py @@ -3,6 +3,8 @@ from setuptools import find_packages, setup requirements = [ 'click', + 'pycurl', + 'requests', ] diff --git a/modules/tile_gen/tile_gen_lib/host_check.py b/modules/tile_gen/tile_gen_lib/host_check.py deleted file mode 100644 index e69de29..0000000 diff --git a/ssh_lib/tasks.py b/ssh_lib/tasks.py index 9be5d9a..2089699 100644 --- a/ssh_lib/tasks.py +++ b/ssh_lib/tasks.py @@ -70,6 +70,7 @@ def prepare_tile_gen(c): c.sudo(f'{VENV_BIN}/pip install -e {TILE_GEN_BIN} --use-pep517') + c.sudo('rm -rf /data/ofm/tile_gen/logs') c.sudo('mkdir -p /data/ofm/tile_gen/logs') c.sudo('chown ofm:ofm /data/ofm/tile_gen/{,*}')