From bdbe3680b768f34b360eb41311464103f8654575 Mon Sep 17 00:00:00 2001 From: LightQuantum Date: Tue, 12 Sep 2023 16:28:36 -0700 Subject: [PATCH] fix: qt was not synced and served with v4 rsync-sjtug --- caddy/Caddyfile.siyuan | 2 +- config.siyuan.yaml | 6 +++--- rsync-gateway-v4/config.siyuan.toml | 5 +++++ rsync-gateway/config.siyuan.toml | 5 ----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan index 80c4f50..7e87250 100644 --- a/caddy/Caddyfile.siyuan +++ b/caddy/Caddyfile.siyuan @@ -433,7 +433,7 @@ mirror.sjtu.edu.cn { } redir /qt /qt/ 301 route /qt/* { - reverse_proxy rsync-gateway:8000 + reverse_proxy rsync-gateway-v4:8000 } redir /debian /debian/ 301 file_server /debian/* browse { diff --git a/config.siyuan.yaml b/config.siyuan.yaml index d151001..3b4f458 100644 --- a/config.siyuan.yaml +++ b/config.siyuan.yaml @@ -150,13 +150,13 @@ repos: <<: *oneshot_common # qt - type: shell_script - script: /worker-script/rsync-fetcher.sh + script: /worker-script/rsync-fetcher-v4.sh source: rsync://master.qt.io/qt-all interval: 6000 rsync_extra_flags: --exclude "snapshots/*" name: qt - serve_mode: rsync_gateway - <<: *rsync_fetcher_common + serve_mode: rsync_gateway_v4 + <<: *rsync_fetcher_v4_common <<: *oneshot_common # debian - type: shell_script diff --git a/rsync-gateway-v4/config.siyuan.toml b/rsync-gateway-v4/config.siyuan.toml index bc31320..6fd17dc 100644 --- a/rsync-gateway-v4/config.siyuan.toml +++ b/rsync-gateway-v4/config.siyuan.toml @@ -17,3 +17,8 @@ s3_prefix = "rsync/leopardsh" namespace = "opencloudos" s3_bucket = "899a892efef34b1b944a19981040f55b-oss01" s3_prefix = "rsync/opencloudos" + +[endpoints.qt] +namespace = "qt" +s3_bucket = "899a892efef34b1b944a19981040f55b-oss01" +s3_prefix = "rsync/qt" diff --git a/rsync-gateway/config.siyuan.toml b/rsync-gateway/config.siyuan.toml index a7f770e..285cb09 100644 --- a/rsync-gateway/config.siyuan.toml +++ b/rsync-gateway/config.siyuan.toml @@ -15,11 +15,6 @@ redis = "redis://redis/" redis_namespace = "raspberry-pi-os-images" s3_website = "https://s3.jcloud.sjtu.edu.cn/899a892efef34b1b944a19981040f55b-oss01/rsync/raspberry-pi-os-images" -[endpoints.qt] -redis = "redis://redis/" -redis_namespace = "qt" -s3_website = "https://s3.jcloud.sjtu.edu.cn/899a892efef34b1b944a19981040f55b-oss01/rsync/qt" - [endpoints.debian-cd] redis = "redis://redis/" redis_namespace = "debian-cd"