From 9334e6a37e4361fd61a51d9bf57dc9bbdada0f1c Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Wed, 27 Dec 2023 03:24:25 +0100
Subject: [PATCH] work

---
 init-server.py                        |  3 ++-
 scripts/tile_gen/planetiler_monaco.sh |  2 +-
 scripts/tile_gen/upload_cloudflare.sh | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/init-server.py b/init-server.py
index c453d7a..38e55a9 100755
--- a/init-server.py
+++ b/init-server.py
@@ -65,13 +65,14 @@ def prepare_tile_gen(c):
         put(
             c,
             CONFIG_DIR / 'rclone.conf',
-            REMOTE_CONFIG,
+            f'{REMOTE_CONFIG}/rclone.conf',
             permissions='600',
             create_parent_dir=True,
         )
 
     c.sudo('chown ofm:ofm /data/ofm')
     c.sudo('chown -R ofm:ofm /data/ofm/tile_gen')
+    c.sudo('chown -R ofm:ofm /data/ofm/config')
 
     sudo_cmd(c, f'cd {TILE_GEN_BIN} && source prepare-virtualenv.sh', user='ofm')
 
diff --git a/scripts/tile_gen/planetiler_monaco.sh b/scripts/tile_gen/planetiler_monaco.sh
index 907804c..1405eba 100644
--- a/scripts/tile_gen/planetiler_monaco.sh
+++ b/scripts/tile_gen/planetiler_monaco.sh
@@ -27,4 +27,4 @@ java -Xmx1g \
 rm -r data
 echo planetiler.jar DONE
 
-$TILE_GEN_BIN/extract_btrfs.sh
\ No newline at end of file
+$TILE_GEN_BIN/extract_btrfs.sh
diff --git a/scripts/tile_gen/upload_cloudflare.sh b/scripts/tile_gen/upload_cloudflare.sh
index 88ffc88..e3ba4be 100644
--- a/scripts/tile_gen/upload_cloudflare.sh
+++ b/scripts/tile_gen/upload_cloudflare.sh
@@ -1,7 +1,20 @@
 #!/usr/bin/env bash
 set -e
 
-DIR_NAME="${PWD##*/}"
+RUN_STR=$(basename "$PWD")
+AREA=$(basename "$(dirname "$PWD")")
+
+
+if [[ $AREA != "planet" && $AREA != "monaco" ]]; then
+  echo "Area must be 'planet' or 'monaco'. Terminating."
+  exit 1
+fi
+
+if [ ! -f /data/ofm/config/rclone.conf ]; then
+    echo "rclone.conf does not exist. Terminating."
+    exit 1
+fi
+
 
 rm -f rclone.log
 
@@ -15,5 +28,5 @@ rclone sync \
   --stats-one-line \
   --log-file rclone.log \
   --exclude rclone.log \
-  . "cf:ofm-planet/$DIR_NAME"
+  . "cf:ofm-$AREA/$RUN_STR"