host_manager

init-server.py

@@ -89,17 +89,17 @@ def prepare_tile_gen(c):
 
 
 def prepare_http_host(c):
-    c.sudo('rm -rf /data/ofm/http_host/logs_nginx')
-    c.sudo('mkdir -p /data/ofm/http_host/logs_nginx')
-    c.sudo('chown nginx:nginx /data/ofm/http_host/logs_nginx')
+    nginx(c)
+    certbot(c)
+    c1000k(c)
 
     c.sudo('rm -rf /data/ofm/http_host/logs')
     c.sudo('mkdir -p /data/ofm/http_host/logs')
     c.sudo('chown ofm:ofm /data/ofm/http_host/logs')
 
-    nginx(c)
-    certbot(c)
-    c1000k(c)
+    c.sudo('rm -rf /data/ofm/http_host/logs_nginx')
+    c.sudo('mkdir -p /data/ofm/http_host/logs_nginx')
+    c.sudo('chown nginx:nginx /data/ofm/http_host/logs_nginx')
 
     upload_https_host_files(c)
     upload_certificates(c)

scripts/http_host/cron.d/ofm_http_host

@@ -2,8 +2,4 @@ PYTHON=/data/ofm/venv/bin/python
 BIN=/data/ofm/http_host/bin
 
 # every minute download_asset.py
-* * * * * root  $PYTHON $BIN/download_assets.py >> /data/ofm/http_host/logs/download_assets.log 2>&1
-* * * * * root  $PYTHON $BIN/download_tiles.py planet --run-mounter >> /data/ofm/http_host/logs/download_tiles_planet.log 2>&1
-* * * * * root  $PYTHON $BIN/download_tiles.py monaco --run-mounter >> /data/ofm/http_host/logs/download_tiles_monaco.log 2>&1
-* * * * * root  $PYTHON $BIN/deploy_tiles_version.py >> /data/ofm/http_host/logs/deploy_tiles_version.log 2>&1
-
+* * * * * ofm     sudo $PYTHON -u $BIN/host_manager.py sync >> /data/ofm/http_host/logs/host_manager_sync.log 2>&1

scripts/http_host/host_manager.py

@@ -66,7 +66,7 @@ def download_tileset(area: str, version: str, list_versions: bool, runs_dir: Pat
     if not runs_dir.parent.exists():
         sys.exit("run dir's parent doesn't exist")
 
-    download_and_extract_tileset(area, selected_version, runs_dir)
+    return download_and_extract_tileset(area, selected_version, runs_dir)
 
 
 @cli.command()
@@ -118,10 +118,14 @@ def sync(ctx):
     """
     print(datetime.datetime.now(tz=datetime.timezone.utc))
 
-    ctx.invoke(download_tileset, area='monaco')
-    # ctx.invoke(download_tileset, area='planet')
+    downloaded = False
+    downloaded += ctx.invoke(download_tileset, area='monaco')
+    # d2 = ctx.invoke(download_tileset, area='planet')
+
+    if downloaded:
+        ctx.invoke(mount)
+
     ctx.invoke(download_assets)
-    ctx.invoke(mount)
 
 
 if __name__ == '__main__':

scripts/http_host/http_host_lib/download_tileset.py

@@ -4,6 +4,7 @@ import sys
 from pathlib import Path
 
 import click
+
 from http_host_lib.utils import download_file_aria2
 
 
@@ -12,12 +13,12 @@ def download_and_extract_tileset(area: str, version: str, runs_dir: Path) -> boo
     returns True if downloaded something
     """
 
-    click.echo(f'Downloading: area: {area}, version: {version}')
+    click.echo(f'downloading area: {area}, version: {version}')
 
     version_dir = runs_dir / area / version
     btrfs_file = version_dir / 'tiles.btrfs'
     if btrfs_file.exists():
-        print('File exists, skipping download')
+        print(' file exists, skipping download')
         return False
 
     temp_dir = runs_dir / '_tmp'