From 2fc91aa470759f71a29e0910b82a4effb3fe0cfe Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Thu, 29 Aug 2024 01:27:08 +0200
Subject: [PATCH] move to scripts

---
 init-server.py                                          | 6 +++++-
 scripts/http_host/{ => scripts}/metadata_to_tilejson.py | 0
 ssh_lib/tasks.py                                        | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 rename scripts/http_host/{ => scripts}/metadata_to_tilejson.py (100%)

diff --git a/init-server.py b/init-server.py
index d9f479a..c1e287e 100755
--- a/init-server.py
+++ b/init-server.py
@@ -12,6 +12,7 @@ from ssh_lib.tasks import (
     setup_ledns_writer,
     setup_loadbalancer,
     upload_http_host_config,
+    upload_http_host_files,
 )
 from ssh_lib.utils import (
     put,
@@ -129,6 +130,9 @@ def loadbalancer(hostname, user, port):
 def debug(hostname, user, port):
     c = get_connection(hostname, user, port)
 
+    upload_http_host_files(c)
+    run_http_host_sync(c)
+
     # upload_http_host_config(c)
     # upload_http_host_files(c)
     # sudo_cmd(c, f'{VENV_BIN}/python -u /data/ofm/http_host/bin/host_manager.py nginx-sync')
@@ -141,7 +145,7 @@ def debug(hostname, user, port):
     #     '/data/ofm/loadbalancer/loadbalancer_lib',
     # )
 
-    prepare_tile_gen(c)
+    # prepare_tile_gen(c)
 
 
 if __name__ == '__main__':
diff --git a/scripts/http_host/metadata_to_tilejson.py b/scripts/http_host/scripts/metadata_to_tilejson.py
similarity index 100%
rename from scripts/http_host/metadata_to_tilejson.py
rename to scripts/http_host/scripts/metadata_to_tilejson.py
diff --git a/ssh_lib/tasks.py b/ssh_lib/tasks.py
index b431519..a495eae 100644
--- a/ssh_lib/tasks.py
+++ b/ssh_lib/tasks.py
@@ -140,7 +140,10 @@ def upload_http_host_files(c):
     c.sudo(f'mkdir -p {HTTP_HOST_BIN}')
 
     put_dir(c, SCRIPTS_DIR / 'http_host', HTTP_HOST_BIN, file_permissions='755')
-    put_dir(c, SCRIPTS_DIR / 'http_host' / 'http_host_lib', f'{HTTP_HOST_BIN}/http_host_lib')
+
+    for dirname in ['http_host_lib', 'scripts']:
+        put_dir(c, SCRIPTS_DIR / 'http_host' / dirname, f'{HTTP_HOST_BIN}/{dirname}')
+
     put_dir(
         c,
         SCRIPTS_DIR / 'http_host' / 'http_host_lib' / 'nginx',