From 748d24065dd5917780d5b4cfe176170208b4941b Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Thu, 28 Dec 2023 19:16:06 +0100
Subject: [PATCH] work

---
 init-server.py                  | 37 +++++++++++++++++++++------------
 scripts/http_host/downloader.py |  2 +-
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/init-server.py b/init-server.py
index bce1d36..8ddba28 100755
--- a/init-server.py
+++ b/init-server.py
@@ -33,20 +33,20 @@ def prepare_shared(c):
     setup_kernel_settings(c)
     set_cpu_governor(c)
 
+    c.sudo(f'mkdir -p {REMOTE_CONFIG}')
+    c.sudo(f'chown ofm:ofm {REMOTE_CONFIG}')
+
     prepare_venv(c)
 
 
 def prepare_venv(c):
-    c.sudo(f'mkdir -p {OFM_DIR}')
     put(
         c,
         SCRIPTS_DIR / 'prepare-virtualenv.sh',
         OFM_DIR,
         permissions='755',
+        owner='ofm',
     )
-
-    c.sudo('chown ofm:ofm /data/ofm')
-
     sudo_cmd(c, f'cd {OFM_DIR} && source prepare-virtualenv.sh', user='ofm')
 
 
@@ -90,11 +90,10 @@ def prepare_tile_gen(c):
             CONFIG_DIR / 'rclone.conf',
             f'{REMOTE_CONFIG}/rclone.conf',
             permissions='600',
-            create_parent_dir=True,
+            owner='ofm',
         )
 
     c.sudo('chown -R ofm:ofm /data/ofm/tile_gen')
-    c.sudo('chown -R ofm:ofm /data/ofm/config')
 
 
 def prepare_http_host(c):
@@ -116,19 +115,31 @@ def prepare_http_host(c):
             permissions='755',
         )
 
+    c.sudo('chown -R ofm:ofm /data/ofm/http_host')
+
 
 def debug_tmp(c):
+    # for file in [
+    #     'extract_btrfs.sh',
+    #     'planetiler_monaco.sh',
+    #     'planetiler_planet.sh',
+    #     'cloudflare_index.sh',
+    #     'cloudflare_upload.sh',
+    # ]:
+    #     put(
+    #         c,
+    #         SCRIPTS_DIR / 'tile_gen' / file,
+    #         TILE_GEN_BIN,
+    #         permissions='755',
+    #     )
+
     for file in [
-        'extract_btrfs.sh',
-        'planetiler_monaco.sh',
-        'planetiler_planet.sh',
-        'cloudflare_index.sh',
-        'cloudflare_upload.sh',
+        'downloader.py',
     ]:
         put(
             c,
-            SCRIPTS_DIR / 'tile_gen' / file,
-            TILE_GEN_BIN,
+            SCRIPTS_DIR / 'http_host' / file,
+            HTTP_HOST_BIN,
             permissions='755',
         )
 
diff --git a/scripts/http_host/downloader.py b/scripts/http_host/downloader.py
index 592c8ef..0bf4387 100755
--- a/scripts/http_host/downloader.py
+++ b/scripts/http_host/downloader.py
@@ -8,7 +8,7 @@ import click
 import requests
 
 
-DEFAULT_RUNS_DIR = '/data/ofm/http_host/runs'
+DEFAULT_RUNS_DIR = Path('/data/ofm/http_host/runs')
 
 
 @click.command()