From 8e143d78cf8dd86b84367912a0af428e6cdbff45 Mon Sep 17 00:00:00 2001 From: truc0 <22969604+truc0@users.noreply.github.com> Date: Thu, 28 Nov 2024 04:29:10 +0800 Subject: [PATCH] fix: wrongly changing Caddyfile --- caddy/Caddyfile.siyuan | 224 +++++++++++++++------------------------- caddy/Caddyfile.zhiyuan | 42 +++++--- config.siyuan.yaml | 152 ++++++++++----------------- 3 files changed, 165 insertions(+), 253 deletions(-) diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan index dd6cd40..f2620f8 100644 --- a/caddy/Caddyfile.siyuan +++ b/caddy/Caddyfile.siyuan @@ -18,40 +18,42 @@ http://mirror.sjtu.edu.cn { header * x-sjtug-mirror-id siyuan @gzip_enabled { + not path /debian/* + not path /debian-security/* + not path /deepin/* not path /docker-ce/* + not path /fedora/linux/* + not path /fedora/epel/* + not path /opensuse/* + not path /remi/* + not path /ubuntu/* + not path /fedora/* } encode @gzip_enabled gzip zstd redir /debian /debian/ 301 - handle /debian/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /debian/* { + redir * https://ftp.sjtu.edu.cn/debian/{uri} 302 } redir /debian-security /debian-security/ 301 - handle /debian-security/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /debian-security/* { + redir * https://ftp.sjtu.edu.cn/debian-security/{uri} 302 } redir /deepin /deepin/ 301 - handle /deepin/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /deepin/* { + redir * https://ftp.sjtu.edu.cn/deepin/{uri} 302 } redir /docker-ce /docker-ce/ 301 - handle /docker-ce/* { - reverse_proxy rsync-gateway:8000 + handle_path /docker-ce/* { + redir * https://ftp.sjtu.edu.cn/docker-ce/{uri} 302 + } + redir /fedora/linux /fedora/linux/ 301 + handle_path /fedora/linux/* { + redir * https://ftp.sjtu.edu.cn/fedora/linux/{uri} 302 + } + redir /fedora/epel /fedora/epel/ 301 + handle_path /fedora/epel/* { + redir * https://ftp.sjtu.edu.cn/fedora/epel/{uri} 302 } redir /fedora-secondary /fedora-secondary/ 301 handle /fedora-secondary/* { @@ -63,31 +65,16 @@ http://mirror.sjtu.edu.cn { respond @hidden 404 } redir /opensuse /opensuse/ 301 - handle /opensuse/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /opensuse/* { + redir * https://ftp.sjtu.edu.cn/opensuse/{uri} 302 } redir /remi /remi/ 301 - handle /remi/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /remi/* { + redir * https://ftp.sjtu.edu.cn/remi/{uri} 302 } redir /ubuntu /ubuntu/ 301 - handle /ubuntu/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /ubuntu/* { + redir * https://ftp.sjtu.edu.cn/ubuntu/{uri} 302 } redir /ubuntu-ports /ubuntu-ports/ 301 handle /ubuntu-ports/* { @@ -117,13 +104,8 @@ http://mirror.sjtu.edu.cn { respond @hidden 404 } redir /fedora /fedora/ 301 - handle /fedora/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /fedora/* { + redir * https://ftp.sjtu.edu.cn/fedora/{uri} 302 } } @@ -200,14 +182,25 @@ https://mirror.sjtu.edu.cn { not path /packman/* not path /raspberry-pi-os-images/* not path /opencloudos/* + not path /debian/* not path /debian-cd/* + not path /debian-security/* + not path /deepin/* not path /deepin-cd/* not path /docker-ce/* + not path /fedora/linux/* + not path /fedora/epel/* + not path /linuxmint/* not path /linuxmint-cd/* not path /mageia/* + not path /opensuse/* not path /openkylin/* not path /openkylin-cdimage/* not path /mx-packages/* + not path /openvz/* + not path /remi/* + not path /ubuntu/* + not path /ubuntu-cdimage/* not path /homebrew-bottles/* not path /rust-static/* not path /pypi-packages/* @@ -246,8 +239,10 @@ https://mirror.sjtu.edu.cn { not path /git/dpdk.git/* not path /gradle/distributions/* not path /git/homebrew-install.git/* + not path /fedora/* not path /manjarostable/* not path /voidlinux/* + not path /archlinux/* not path /bioconductor/* not path /wireshark/* not path /macports/* @@ -356,8 +351,8 @@ https://mirror.sjtu.edu.cn { reverse_proxy rsync-gateway:8000 } redir /debian-cdimage /debian-cdimage/ 301 - handle /debian-cdimage/* { - reverse_proxy rsync-gateway:8000 + handle_path /debian-cdimage/* { + redir * https://ftp.sjtu.edu.cn/debian-cd/{uri} 302 } redir /packman /packman/ 301 handle /packman/* { @@ -408,43 +403,36 @@ https://mirror.sjtu.edu.cn { reverse_proxy rsync-gateway:8000 } redir /debian /debian/ 301 - handle /debian/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /debian/* { + redir * https://ftp.sjtu.edu.cn/debian/{uri} 302 } redir /debian-cd /debian-cd/ 301 - handle /debian-cd/* { - reverse_proxy rsync-gateway:8000 + handle_path /debian-cd/* { + redir * https://ftp.sjtu.edu.cn/debian-cd/{uri} 302 } redir /debian-security /debian-security/ 301 - handle /debian-security/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /debian-security/* { + redir * https://ftp.sjtu.edu.cn/debian-security/{uri} 302 } redir /deepin /deepin/ 301 - handle /deepin/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /deepin/* { + redir * https://ftp.sjtu.edu.cn/deepin/{uri} 302 } redir /deepin-cd /deepin-cd/ 301 - handle /deepin-cd/* { - reverse_proxy rsync-gateway:8000 + handle_path /deepin-cd/* { + redir * https://ftp.sjtu.edu.cn/deepin-cd/{uri} 302 } redir /docker-ce /docker-ce/ 301 - handle /docker-ce/* { - reverse_proxy rsync-gateway:8000 + handle_path /docker-ce/* { + redir * https://ftp.sjtu.edu.cn/docker-ce/{uri} 302 + } + redir /fedora/linux /fedora/linux/ 301 + handle_path /fedora/linux/* { + redir * https://ftp.sjtu.edu.cn/fedora/linux/{uri} 302 + } + redir /fedora/epel /fedora/epel/ 301 + handle_path /fedora/epel/* { + redir * https://ftp.sjtu.edu.cn/fedora/epel/{uri} 302 } redir /fedora-secondary /fedora-secondary/ 301 handle /fedora-secondary/* { @@ -456,30 +444,20 @@ https://mirror.sjtu.edu.cn { respond @hidden 404 } redir /linuxmint /linuxmint/ 301 - handle /linuxmint/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /linuxmint/* { + redir * https://ftp.sjtu.edu.cn/linuxmint/packages/{uri} 302 } redir /linuxmint-cd /linuxmint-cd/ 301 - handle /linuxmint-cd/* { - reverse_proxy rsync-gateway:8000 + handle_path /linuxmint-cd/* { + redir * https://ftp.sjtu.edu.cn/linuxmint-cd/{uri} 302 } redir /mageia /mageia/ 301 handle_path /mageia/* { redir * https://ftp.sjtu.edu.cn/mageia/{uri} 302 } redir /opensuse /opensuse/ 301 - handle /opensuse/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /opensuse/* { + redir * https://ftp.sjtu.edu.cn/opensuse/{uri} 302 } redir /openkylin /openkylin/ 301 handle /openkylin/* { @@ -494,22 +472,12 @@ https://mirror.sjtu.edu.cn { reverse_proxy rsync-gateway:8000 } redir /openvz /openvz/ 301 - handle /openvz/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /openvz/* { + redir * https://ftp.sjtu.edu.cn/openvz/{uri} 302 } redir /remi /remi/ 301 - handle /remi/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /remi/* { + redir * https://ftp.sjtu.edu.cn/remi/{uri} 302 } redir /termux /termux/ 301 handle /termux/* { @@ -521,13 +489,8 @@ https://mirror.sjtu.edu.cn { respond @hidden 404 } redir /ubuntu /ubuntu/ 301 - handle /ubuntu/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /ubuntu/* { + redir * https://ftp.sjtu.edu.cn/ubuntu/{uri} 302 } redir /ubuntu-releases /ubuntu-releases/ 301 handle /ubuntu-releases/* { @@ -539,13 +502,8 @@ https://mirror.sjtu.edu.cn { respond @hidden 404 } redir /ubuntu-cdimage /ubuntu-cdimage/ 301 - handle /ubuntu-cdimage/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /ubuntu-cdimage/* { + redir * https://ftp.sjtu.edu.cn/ubuntu-cd/{uri} 302 } redir /ubuntu-ports /ubuntu-ports/ 301 handle /ubuntu-ports/* { @@ -745,13 +703,8 @@ https://mirror.sjtu.edu.cn { respond @hidden 404 } redir /fedora /fedora/ 301 - handle /fedora/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /fedora/* { + redir * https://ftp.sjtu.edu.cn/fedora/{uri} 302 } redir /manjaro /manjaro/ 301 handle /manjaro/* { @@ -771,13 +724,8 @@ https://mirror.sjtu.edu.cn { reverse_proxy mirror-intel:8000 } redir /archlinux /archlinux/ 301 - handle /archlinux/* { - file_server browse { - root /srv/data32T - hide .* - } - @hidden path */.* - respond @hidden 404 + handle_path /archlinux/* { + redir * https://ftp.sjtu.edu.cn/archlinux/{uri} 302 } redir /bioconductor /bioconductor/ 301 handle /bioconductor/* { diff --git a/caddy/Caddyfile.zhiyuan b/caddy/Caddyfile.zhiyuan index c25cd20..924484c 100644 --- a/caddy/Caddyfile.zhiyuan +++ b/caddy/Caddyfile.zhiyuan @@ -201,6 +201,8 @@ https://mirrors.sjtug.sjtu.edu.cn { not path /deepin/* not path /deepin-cd/* not path /docker-ce/* + not path /fedora/linux/* + not path /fedora/epel/* not path /fedora-secondary/* not path /linuxmint/* not path /linuxmint-cd/* @@ -615,7 +617,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /debian-cdimage /debian-cdimage/ 301 handle_path /debian-cdimage/* { - redir * https://mirror.sjtu.edu.cn/debian-cdimage{uri} 302 + redir * https://ftp.sjtu.edu.cn/debian-cd/{uri} 302 } redir /packman /packman/ 301 handle_path /packman/* { @@ -647,27 +649,35 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /debian /debian/ 301 handle_path /debian/* { - redir * https://mirror.sjtu.edu.cn/debian{uri} 302 + redir * https://ftp.sjtu.edu.cn/debian/{uri} 302 } redir /debian-cd /debian-cd/ 301 handle_path /debian-cd/* { - redir * https://mirror.sjtu.edu.cn/debian-cd{uri} 302 + redir * https://ftp.sjtu.edu.cn/debian-cd/{uri} 302 } redir /debian-security /debian-security/ 301 handle_path /debian-security/* { - redir * https://mirror.sjtu.edu.cn/debian-security{uri} 302 + redir * https://ftp.sjtu.edu.cn/debian-security/{uri} 302 } redir /deepin /deepin/ 301 handle_path /deepin/* { - redir * https://mirror.sjtu.edu.cn/deepin{uri} 302 + redir * https://ftp.sjtu.edu.cn/deepin/{uri} 302 } redir /deepin-cd /deepin-cd/ 301 handle_path /deepin-cd/* { - redir * https://mirror.sjtu.edu.cn/deepin-cd{uri} 302 + redir * https://ftp.sjtu.edu.cn/deepin-cd/{uri} 302 } redir /docker-ce /docker-ce/ 301 handle_path /docker-ce/* { - redir * https://mirror.sjtu.edu.cn/docker-ce{uri} 302 + redir * https://ftp.sjtu.edu.cn/docker-ce/{uri} 302 + } + redir /fedora/linux /fedora/linux/ 301 + handle_path /fedora/linux/* { + redir * https://ftp.sjtu.edu.cn/fedora/linux/{uri} 302 + } + redir /fedora/epel /fedora/epel/ 301 + handle_path /fedora/epel/* { + redir * https://ftp.sjtu.edu.cn/fedora/epel/{uri} 302 } redir /fedora-secondary /fedora-secondary/ 301 handle_path /fedora-secondary/* { @@ -675,11 +685,11 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /linuxmint /linuxmint/ 301 handle_path /linuxmint/* { - redir * https://mirror.sjtu.edu.cn/linuxmint{uri} 302 + redir * https://ftp.sjtu.edu.cn/linuxmint/packages/{uri} 302 } redir /linuxmint-cd /linuxmint-cd/ 301 handle_path /linuxmint-cd/* { - redir * https://mirror.sjtu.edu.cn/linuxmint-cd{uri} 302 + redir * https://ftp.sjtu.edu.cn/linuxmint-cd/{uri} 302 } redir /mageia /mageia/ 301 handle_path /mageia/* { @@ -687,7 +697,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /opensuse /opensuse/ 301 handle_path /opensuse/* { - redir * https://mirror.sjtu.edu.cn/opensuse{uri} 302 + redir * https://ftp.sjtu.edu.cn/opensuse/{uri} 302 } redir /openkylin /openkylin/ 301 handle_path /openkylin/* { @@ -703,11 +713,11 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /openvz /openvz/ 301 handle_path /openvz/* { - redir * https://mirror.sjtu.edu.cn/openvz{uri} 302 + redir * https://ftp.sjtu.edu.cn/openvz/{uri} 302 } redir /remi /remi/ 301 handle_path /remi/* { - redir * https://mirror.sjtu.edu.cn/remi{uri} 302 + redir * https://ftp.sjtu.edu.cn/remi/{uri} 302 } redir /termux /termux/ 301 handle_path /termux/* { @@ -715,7 +725,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /ubuntu /ubuntu/ 301 handle_path /ubuntu/* { - redir * https://mirror.sjtu.edu.cn/ubuntu{uri} 302 + redir * https://ftp.sjtu.edu.cn/ubuntu/{uri} 302 } redir /ubuntu-releases /ubuntu-releases/ 301 handle_path /ubuntu-releases/* { @@ -723,7 +733,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /ubuntu-cdimage /ubuntu-cdimage/ 301 handle_path /ubuntu-cdimage/* { - redir * https://mirror.sjtu.edu.cn/ubuntu-cdimage{uri} 302 + redir * https://ftp.sjtu.edu.cn/ubuntu-cd/{uri} 302 } redir /ubuntu-ports /ubuntu-ports/ 301 handle_path /ubuntu-ports/* { @@ -879,7 +889,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /fedora /fedora/ 301 handle_path /fedora/* { - redir * https://mirror.sjtu.edu.cn/fedora{uri} 302 + redir * https://ftp.sjtu.edu.cn/fedora/{uri} 302 } redir /manjaro /manjaro/ 301 handle_path /manjaro/* { @@ -895,7 +905,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /archlinux /archlinux/ 301 handle_path /archlinux/* { - redir * https://mirror.sjtu.edu.cn/archlinux{uri} 302 + redir * https://ftp.sjtu.edu.cn/archlinux/{uri} 302 } redir /bioconductor /bioconductor/ 301 handle_path /bioconductor/* { diff --git a/config.siyuan.yaml b/config.siyuan.yaml index d26eae9..78e9ac2 100644 --- a/config.siyuan.yaml +++ b/config.siyuan.yaml @@ -113,14 +113,10 @@ repos: <<: *rsync_fetcher_common <<: *oneshot_common # debian-cdimage - - type: shell_script + - type: external name: debian-cdimage - script: /worker-script/rsync-fetcher.sh - interval: 30401 - source: rsync://cdimage.debian.org/cdimage/ - serve_mode: rsync_gateway - rsync_extra_flags: --exclude=archive/ --exclude="daily-*/" --exclude=source/ --include=".latest" --exclude=".*/" --exclude="*alpha*" --exclude="*-edu-*" --exclude=/blends-live --exclude=/cd-sources --exclude=/release --exclude=/experimental-live --exclude="/snapshot*" --exclude="/stretch*" --exclude=/tmp --include=/unofficial/non-free --exclude="/unofficial/*" --exclude="/project*" --exclude=/cloud/test --exclude="/cloud/**/daily" - <<: *rsync_fetcher_common + serve_mode: redir + target: https://ftp.sjtu.edu.cn/debian-cd/ <<: *oneshot_common # packman - type: shell_script @@ -196,80 +192,57 @@ repos: # <<: *rsync_fetcher_common # <<: *oneshot_common # debian - - type: shell_script - script: /worker-script/debian.sh - source: mirrors6.tuna.tsinghua.edu.cn - interval: 5400 - path: /srv/data32T/debian + - type: external name: debian + serve_mode: redir + target: https://ftp.sjtu.edu.cn/debian/ no_redir_http: true <<: *oneshot_common # debian-cd - - type: shell_script - script: /worker-script/rsync-fetcher.sh - source: rsync://cdimage.debian.org/debian-cd/ - interval: 23600 + - type: external name: debian-cd - serve_mode: rsync_gateway - <<: *rsync_fetcher_common + serve_mode: redir + target: https://ftp.sjtu.edu.cn/debian-cd/ <<: *oneshot_common # debian-security - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://rsync.security.debian.org/debian-security/ - interval: 6700 - path: /srv/data32T/debian-security + - type: external name: debian-security + serve_mode: redir + target: https://ftp.sjtu.edu.cn/debian-security/ no_redir_http: true <<: *oneshot_common # deepin - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://rsync.deepin.com/deepin/ - interval: 6200 - path: /srv/data32T/deepin + - type: external name: deepin + serve_mode: redir + target: https://ftp.sjtu.edu.cn/deepin/ no_redir_http: true <<: *oneshot_common # deepin-cd - - type: shell_script - script: /worker-script/rsync-fetcher.sh - source: rsync://rsync.deepin.com/cdimage/ - interval: 6000 + - type: external name: deepin-cd - serve_mode: rsync_gateway - <<: *rsync_fetcher_common + serve_mode: redir + target: https://ftp.sjtu.edu.cn/deepin-cd/ <<: *oneshot_common # docker-ce - - type: shell_script - script: /worker-script/rsync-fetcher.sh - source: rsync://mirrors6.tuna.tsinghua.edu.cn/docker-ce/ - interval: 4900 + - type: external name: docker-ce + serve_mode: redir + target: https://ftp.sjtu.edu.cn/docker-ce/ no_redir_http: true - serve_mode: rsync_gateway - <<: *rsync_fetcher_common <<: *oneshot_common # fedora/linux - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://dl.fedoraproject.org/fedora-enchilada/linux/ - interval: 5000 - path: /srv/data32T/fedora/linux + - type: external name: fedora/linux - serve_mode: ignore - rsync_extra_flags: --exclude "extras/*" --exclude "*/debug/*" + serve_mode: redir + target: https://ftp.sjtu.edu.cn/fedora/linux/ no_redir_http: true <<: *oneshot_common # fedora/epel - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://dl-iad01.fedoraproject.org/fedora-epel/ - interval: 5000 - path: /srv/data32T/fedora/epel + - type: external name: fedora/epel - serve_mode: ignore - rsync_extra_flags: --exclude "development/*" --exclude "extras/*" --exclude "*/debug/*" + serve_mode: redir + target: https://ftp.sjtu.edu.cn/fedora/epel/ no_redir_http: true <<: *oneshot_common # fedora-secondary @@ -283,21 +256,16 @@ repos: no_redir_http: true <<: *oneshot_common # linuxmint - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://rsync-packages.linuxmint.com/packages/ - interval: 6500 - path: /srv/data32T/linuxmint + - type: external name: linuxmint + serve_mode: redir + target: https://ftp.sjtu.edu.cn/linuxmint/packages/ <<: *oneshot_common # linuxmint-cd - - type: shell_script - script: /worker-script/rsync-fetcher.sh - source: rsync://pub.linuxmint.com/pub/ - interval: 21000 + - type: external name: linuxmint-cd - serve_mode: rsync_gateway - <<: *rsync_fetcher_common + serve_mode: redir + target: https://ftp.sjtu.edu.cn/linuxmint-cd/ <<: *oneshot_common # mageia - type: external @@ -307,13 +275,10 @@ repos: disabled: true <<: *oneshot_common # opensuse - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://fr2.rpmfind.net/linux/opensuse/ - interval: 8000 - rsync_extra_flags: --exclude "history/*" --exclude "source/*" --exclude "debug/*" --exclude "ports/zsystems/*" --exclude "ports/riscv/*" --exclude "ports/update/*" - path: /srv/data32T/opensuse + - type: external name: opensuse + serve_mode: redir + target: https://ftp.sjtu.edu.cn/opensuse/ no_redir_http: true <<: *oneshot_common # openkylin @@ -353,20 +318,16 @@ repos: <<: *rsync_fetcher_common <<: *oneshot_common # openvz - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://download.openvz.org/openvz-download - interval: 43600 # may be wrong - path: /srv/data32T/openvz + - type: external name: openvz + serve_mode: redir + target: https://ftp.sjtu.edu.cn/openvz/ <<: *oneshot_common # remi - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://remi.mirror.karneval.cz/remi - interval: 43000 - path: /srv/data32T/remi + - type: external name: remi + serve_mode: redir + target: https://ftp.sjtu.edu.cn/remi/ no_redir_http: true <<: *oneshot_common # scientific @@ -389,12 +350,10 @@ repos: rsync_extra_flags: --exclude "termux-main-21" <<: *oneshot_common #ubuntu - - type: shell_script - script: /worker-script/ubuntu-debian-rsync.sh - source: rsync://archive.ubuntu.com/ubuntu/ - interval: 4500 - path: /srv/data32T/ubuntu + - type: external name: ubuntu + serve_mode: redir + target: https://ftp.sjtu.edu.cn/ubuntu/ no_redir_http: true <<: *oneshot_common # ubuntu-releases @@ -406,12 +365,10 @@ repos: name: ubuntu-releases <<: *oneshot_common # ubuntu-cdimage - - type: shell_script - script: /worker-script/rsync.sh - source: rsync://mirrors6.tuna.tsinghua.edu.cn/ubuntu-cdimage/ - interval: 24900 - path: /srv/data32T/ubuntu-cdimage + - type: external name: ubuntu-cdimage + serve_mode: redir + target: https://ftp.sjtu.edu.cn/ubuntu-cd/ <<: *oneshot_common # ubuntu-ports - type: shell_script @@ -747,9 +704,9 @@ repos: name: openeuler <<: *oneshot_common - type: external - path: /srv/data32T/fedora name: fedora - disabled: true + serve_mode: redir + target: https://ftp.sjtu.edu.cn/fedora/ no_redir_http: true <<: *oneshot_common - type: shell_script @@ -773,13 +730,10 @@ repos: # Note: this source is only used for mirrorz to have correct source info in mirrorz.json. If you want to change upstream, also change the upstream in mirror-clone command. source: https://mirrors.tuna.tsinghua.edu.cn/voidlinux <<: *oneshot_common - - type: shell_script + - type: external name: archlinux - interval: 5300 - path: /srv/data32T/archlinux - script: /worker-script/zhiyuan/worker-script/archlinux.sh - source: rsync://mirrors.tuna.tsinghua.edu.cn/archlinux/ - lastupdate: https://mirrors.tuna.tsinghua.edu.cn/archlinux/lastupdate + serve_mode: redir + target: https://ftp.sjtu.edu.cn/archlinux/ <<: *oneshot_common # bioconductor - type: shell_script