diff --git a/init-server.py b/init-server.py index 58c8310..75788c0 100755 --- a/init-server.py +++ b/init-server.py @@ -51,7 +51,8 @@ def prepare_tile_gen(c): 'extract_btrfs.sh', 'planetiler_monaco.sh', 'planetiler_planet.sh', - 'upload_cloudflare.sh', + 'cloudflare_index.sh', + 'cloudflare_upload.sh', ]: put( c, @@ -100,8 +101,8 @@ def debug_tmp(c): 'extract_btrfs.sh', 'planetiler_monaco.sh', 'planetiler_planet.sh', - 'prepare-virtualenv.sh', - 'upload_cloudflare.sh', + 'cloudflare_index.sh', + 'cloudflare_upload.sh', ]: put( c, diff --git a/scripts/tile_gen/cloudflare_upload.sh b/scripts/tile_gen/cloudflare_upload.sh index b250b2f..b53bb95 100755 --- a/scripts/tile_gen/cloudflare_upload.sh +++ b/scripts/tile_gen/cloudflare_upload.sh @@ -5,7 +5,7 @@ AREA=$(basename "$(dirname "$PWD")") VERSION=$(basename "$PWD") export RCLONE_CONFIG=/data/ofm/config/rclone.conf - +SCRIPT_DIR=$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P) if [[ $AREA != "planet" && $AREA != "monaco" ]]; then echo "Area must be 'planet' or 'monaco'. Terminating." @@ -18,6 +18,7 @@ if [ ! -f $RCLONE_CONFIG ]; then fi +mkdir logs rm -f logs/rclone.log rclone sync \ @@ -31,3 +32,5 @@ rclone sync \ --exclude 'logs/**' \ . "cf:ofm-$AREA/$VERSION" + +bash "$SCRIPT_DIR/cloudflare_index.sh" \ No newline at end of file