diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan index f2620f8..30e6b73 100644 --- a/caddy/Caddyfile.siyuan +++ b/caddy/Caddyfile.siyuan @@ -33,27 +33,27 @@ http://mirror.sjtu.edu.cn { redir /debian /debian/ 301 handle_path /debian/* { - redir * https://ftp.sjtu.edu.cn/debian/{uri} 302 + redir * https://ftp.sjtu.edu.cn/debian{uri} 302 } redir /debian-security /debian-security/ 301 handle_path /debian-security/* { - redir * https://ftp.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://ftp.sjtu.edu.cn/deepin/{uri} 302 + redir * https://ftp.sjtu.edu.cn/deepin{uri} 302 } redir /docker-ce /docker-ce/ 301 handle_path /docker-ce/* { - redir * https://ftp.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 * 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 * https://ftp.sjtu.edu.cn/fedora/epel{uri} 302 } redir /fedora-secondary /fedora-secondary/ 301 handle /fedora-secondary/* { @@ -66,11 +66,11 @@ http://mirror.sjtu.edu.cn { } redir /opensuse /opensuse/ 301 handle_path /opensuse/* { - redir * https://ftp.sjtu.edu.cn/opensuse/{uri} 302 + redir * https://ftp.sjtu.edu.cn/opensuse{uri} 302 } redir /remi /remi/ 301 handle_path /remi/* { - redir * https://ftp.sjtu.edu.cn/remi/{uri} 302 + redir * https://ftp.sjtu.edu.cn/remi{uri} 302 } redir /ubuntu /ubuntu/ 301 handle_path /ubuntu/* { @@ -105,7 +105,7 @@ http://mirror.sjtu.edu.cn { } redir /fedora /fedora/ 301 handle_path /fedora/* { - redir * https://ftp.sjtu.edu.cn/fedora/{uri} 302 + redir * https://ftp.sjtu.edu.cn/fedora{uri} 302 } } @@ -352,7 +352,7 @@ https://mirror.sjtu.edu.cn { } redir /debian-cdimage /debian-cdimage/ 301 handle_path /debian-cdimage/* { - redir * https://ftp.sjtu.edu.cn/debian-cd/{uri} 302 + redir * https://ftp.sjtu.edu.cn/debian-cd{uri} 302 } redir /packman /packman/ 301 handle /packman/* { @@ -404,35 +404,35 @@ https://mirror.sjtu.edu.cn { } redir /debian /debian/ 301 handle_path /debian/* { - redir * https://ftp.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://ftp.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://ftp.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://ftp.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://ftp.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://ftp.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 * 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 * https://ftp.sjtu.edu.cn/fedora/epel{uri} 302 } redir /fedora-secondary /fedora-secondary/ 301 handle /fedora-secondary/* { @@ -445,19 +445,19 @@ https://mirror.sjtu.edu.cn { } redir /linuxmint /linuxmint/ 301 handle_path /linuxmint/* { - redir * https://ftp.sjtu.edu.cn/linuxmint/packages/{uri} 302 + redir * https://ftp.sjtu.edu.cn/linuxmint/packages{uri} 302 } redir /linuxmint-cd /linuxmint-cd/ 301 handle_path /linuxmint-cd/* { - redir * https://ftp.sjtu.edu.cn/linuxmint-cd/{uri} 302 + 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 * https://ftp.sjtu.edu.cn/mageia{uri} 302 } redir /opensuse /opensuse/ 301 handle_path /opensuse/* { - redir * https://ftp.sjtu.edu.cn/opensuse/{uri} 302 + redir * https://ftp.sjtu.edu.cn/opensuse{uri} 302 } redir /openkylin /openkylin/ 301 handle /openkylin/* { @@ -473,11 +473,11 @@ https://mirror.sjtu.edu.cn { } redir /openvz /openvz/ 301 handle_path /openvz/* { - redir * https://ftp.sjtu.edu.cn/openvz/{uri} 302 + redir * https://ftp.sjtu.edu.cn/openvz{uri} 302 } redir /remi /remi/ 301 handle_path /remi/* { - redir * https://ftp.sjtu.edu.cn/remi/{uri} 302 + redir * https://ftp.sjtu.edu.cn/remi{uri} 302 } redir /termux /termux/ 301 handle /termux/* { @@ -503,7 +503,7 @@ https://mirror.sjtu.edu.cn { } redir /ubuntu-cdimage /ubuntu-cdimage/ 301 handle_path /ubuntu-cdimage/* { - redir * https://ftp.sjtu.edu.cn/ubuntu-cd/{uri} 302 + redir * https://ftp.sjtu.edu.cn/ubuntu-cd{uri} 302 } redir /ubuntu-ports /ubuntu-ports/ 301 handle /ubuntu-ports/* { @@ -704,7 +704,7 @@ https://mirror.sjtu.edu.cn { } redir /fedora /fedora/ 301 handle_path /fedora/* { - redir * https://ftp.sjtu.edu.cn/fedora/{uri} 302 + redir * https://ftp.sjtu.edu.cn/fedora{uri} 302 } redir /manjaro /manjaro/ 301 handle /manjaro/* { @@ -725,7 +725,7 @@ https://mirror.sjtu.edu.cn { } redir /archlinux /archlinux/ 301 handle_path /archlinux/* { - redir * https://ftp.sjtu.edu.cn/archlinux/{uri} 302 + 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 924484c..38eebff 100644 --- a/caddy/Caddyfile.zhiyuan +++ b/caddy/Caddyfile.zhiyuan @@ -617,7 +617,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /debian-cdimage /debian-cdimage/ 301 handle_path /debian-cdimage/* { - redir * https://ftp.sjtu.edu.cn/debian-cd/{uri} 302 + redir * https://ftp.sjtu.edu.cn/debian-cd{uri} 302 } redir /packman /packman/ 301 handle_path /packman/* { @@ -649,35 +649,35 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /debian /debian/ 301 handle_path /debian/* { - redir * https://ftp.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://ftp.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://ftp.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://ftp.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://ftp.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://ftp.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 * 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 * https://ftp.sjtu.edu.cn/fedora/epel{uri} 302 } redir /fedora-secondary /fedora-secondary/ 301 handle_path /fedora-secondary/* { @@ -685,19 +685,19 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /linuxmint /linuxmint/ 301 handle_path /linuxmint/* { - redir * https://ftp.sjtu.edu.cn/linuxmint/packages/{uri} 302 + redir * https://ftp.sjtu.edu.cn/linuxmint/packages{uri} 302 } redir /linuxmint-cd /linuxmint-cd/ 301 handle_path /linuxmint-cd/* { - redir * https://ftp.sjtu.edu.cn/linuxmint-cd/{uri} 302 + 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 * https://ftp.sjtu.edu.cn/mageia{uri} 302 } redir /opensuse /opensuse/ 301 handle_path /opensuse/* { - redir * https://ftp.sjtu.edu.cn/opensuse/{uri} 302 + redir * https://ftp.sjtu.edu.cn/opensuse{uri} 302 } redir /openkylin /openkylin/ 301 handle_path /openkylin/* { @@ -713,11 +713,11 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /openvz /openvz/ 301 handle_path /openvz/* { - redir * https://ftp.sjtu.edu.cn/openvz/{uri} 302 + redir * https://ftp.sjtu.edu.cn/openvz{uri} 302 } redir /remi /remi/ 301 handle_path /remi/* { - redir * https://ftp.sjtu.edu.cn/remi/{uri} 302 + redir * https://ftp.sjtu.edu.cn/remi{uri} 302 } redir /termux /termux/ 301 handle_path /termux/* { @@ -733,7 +733,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /ubuntu-cdimage /ubuntu-cdimage/ 301 handle_path /ubuntu-cdimage/* { - redir * https://ftp.sjtu.edu.cn/ubuntu-cd/{uri} 302 + redir * https://ftp.sjtu.edu.cn/ubuntu-cd{uri} 302 } redir /ubuntu-ports /ubuntu-ports/ 301 handle_path /ubuntu-ports/* { @@ -889,7 +889,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /fedora /fedora/ 301 handle_path /fedora/* { - redir * https://ftp.sjtu.edu.cn/fedora/{uri} 302 + redir * https://ftp.sjtu.edu.cn/fedora{uri} 302 } redir /manjaro /manjaro/ 301 handle_path /manjaro/* { @@ -905,7 +905,7 @@ https://mirrors.sjtug.sjtu.edu.cn { } redir /archlinux /archlinux/ 301 handle_path /archlinux/* { - redir * https://ftp.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 78e9ac2..16047d6 100644 --- a/config.siyuan.yaml +++ b/config.siyuan.yaml @@ -116,7 +116,7 @@ repos: - type: external name: debian-cdimage serve_mode: redir - target: https://ftp.sjtu.edu.cn/debian-cd/ + target: https://ftp.sjtu.edu.cn/debian-cd <<: *oneshot_common # packman - type: shell_script @@ -195,54 +195,54 @@ repos: - type: external name: debian serve_mode: redir - target: https://ftp.sjtu.edu.cn/debian/ + target: https://ftp.sjtu.edu.cn/debian no_redir_http: true <<: *oneshot_common # debian-cd - type: external name: debian-cd serve_mode: redir - target: https://ftp.sjtu.edu.cn/debian-cd/ + target: https://ftp.sjtu.edu.cn/debian-cd <<: *oneshot_common # debian-security - type: external name: debian-security serve_mode: redir - target: https://ftp.sjtu.edu.cn/debian-security/ + target: https://ftp.sjtu.edu.cn/debian-security no_redir_http: true <<: *oneshot_common # deepin - type: external name: deepin serve_mode: redir - target: https://ftp.sjtu.edu.cn/deepin/ + target: https://ftp.sjtu.edu.cn/deepin no_redir_http: true <<: *oneshot_common # deepin-cd - type: external name: deepin-cd serve_mode: redir - target: https://ftp.sjtu.edu.cn/deepin-cd/ + target: https://ftp.sjtu.edu.cn/deepin-cd <<: *oneshot_common # docker-ce - type: external name: docker-ce serve_mode: redir - target: https://ftp.sjtu.edu.cn/docker-ce/ + target: https://ftp.sjtu.edu.cn/docker-ce no_redir_http: true <<: *oneshot_common # fedora/linux - type: external name: fedora/linux serve_mode: redir - target: https://ftp.sjtu.edu.cn/fedora/linux/ + target: https://ftp.sjtu.edu.cn/fedora/linux no_redir_http: true <<: *oneshot_common # fedora/epel - type: external name: fedora/epel serve_mode: redir - target: https://ftp.sjtu.edu.cn/fedora/epel/ + target: https://ftp.sjtu.edu.cn/fedora/epel no_redir_http: true <<: *oneshot_common # fedora-secondary @@ -259,26 +259,26 @@ repos: - type: external name: linuxmint serve_mode: redir - target: https://ftp.sjtu.edu.cn/linuxmint/packages/ + target: https://ftp.sjtu.edu.cn/linuxmint/packages <<: *oneshot_common # linuxmint-cd - type: external name: linuxmint-cd serve_mode: redir - target: https://ftp.sjtu.edu.cn/linuxmint-cd/ + target: https://ftp.sjtu.edu.cn/linuxmint-cd <<: *oneshot_common # mageia - type: external name: mageia serve_mode: redir - target: https://ftp.sjtu.edu.cn/mageia/ + target: https://ftp.sjtu.edu.cn/mageia disabled: true <<: *oneshot_common # opensuse - type: external name: opensuse serve_mode: redir - target: https://ftp.sjtu.edu.cn/opensuse/ + target: https://ftp.sjtu.edu.cn/opensuse no_redir_http: true <<: *oneshot_common # openkylin @@ -321,13 +321,13 @@ repos: - type: external name: openvz serve_mode: redir - target: https://ftp.sjtu.edu.cn/openvz/ + target: https://ftp.sjtu.edu.cn/openvz <<: *oneshot_common # remi - type: external name: remi serve_mode: redir - target: https://ftp.sjtu.edu.cn/remi/ + target: https://ftp.sjtu.edu.cn/remi no_redir_http: true <<: *oneshot_common # scientific @@ -368,7 +368,7 @@ repos: - type: external name: ubuntu-cdimage serve_mode: redir - target: https://ftp.sjtu.edu.cn/ubuntu-cd/ + target: https://ftp.sjtu.edu.cn/ubuntu-cd <<: *oneshot_common # ubuntu-ports - type: shell_script @@ -706,7 +706,7 @@ repos: - type: external name: fedora serve_mode: redir - target: https://ftp.sjtu.edu.cn/fedora/ + target: https://ftp.sjtu.edu.cn/fedora no_redir_http: true <<: *oneshot_common - type: shell_script @@ -733,7 +733,7 @@ repos: - type: external name: archlinux serve_mode: redir - target: https://ftp.sjtu.edu.cn/archlinux/ + target: https://ftp.sjtu.edu.cn/archlinux <<: *oneshot_common # bioconductor - type: shell_script diff --git a/docker-compose.siyuan.yml b/docker-compose.siyuan.yml index 2e4a9e6..e4187f5 100644 --- a/docker-compose.siyuan.yml +++ b/docker-compose.siyuan.yml @@ -11,6 +11,7 @@ services: container_name: siyuan-caddy volumes: - "/mnt/data32T:/srv/data32T:ro" + - "/mnt/nfs27T:/srv/nfs27T:ro" - "./caddy/Caddyfile.siyuan:/etc/caddy/Caddyfile:ro" - "/etc/ssl/certs/ftp_sjtu:/etc/ssl/certs/ftp_sjtu:ro" mem_limit: 20G @@ -20,6 +21,7 @@ services: container_name: siyuan-lug volumes: - "/mnt/data32T:/srv/data32T" + - "/mnt/nfs27T:/srv/nfs27T" - "./config.siyuan.yaml:/config.yaml:ro" environment: MIRROR_CLONE_SITE: "mirror.sjtu.edu.cn" @@ -56,7 +58,7 @@ services: mirror-intel: container_name: siyuan-mirror-intel volumes: - - "/mnt/data32T/mirror-intel-cache:/mnt/cache" + - "/mnt/nfs27T/mirror-intel-cache:/mnt/cache" mem_limit: 15G memswap_limit: 15G @@ -91,6 +93,7 @@ services: volumes: - ./rsyncd/rsyncd.siyuan.conf:/etc/rsyncd.conf:ro - /mnt/data32T:/srv/data32T:ro + - /mnt/nfs27T:/srv/nfs27T:ro - ./rsyncd/motd.siyuan:/etc/rsync/motd:ro blkio_config: weight: 10