diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan index 9d4f4c3..997e119 100644 --- a/caddy/Caddyfile.siyuan +++ b/caddy/Caddyfile.siyuan @@ -193,6 +193,7 @@ https://mirror.sjtu.edu.cn { @gzip_enabled { not path /speedtest/* + not path /nspawn/* not path /anthon/* not path /leopardsh/* not path /endeavouros/* @@ -319,6 +320,10 @@ https://mirror.sjtu.edu.cn { } encode @gzip_enabled gzip zstd + redir /nspawn /nspawn/ 301 + handle /nspawn/* { + reverse_proxy rsync-gateway:8000 + } redir /anthon /anthon/ 301 handle /anthon/* { reverse_proxy rsync-gateway:8000 diff --git a/caddy/Caddyfile.zhiyuan b/caddy/Caddyfile.zhiyuan index 78091d1..3c60458 100644 --- a/caddy/Caddyfile.zhiyuan +++ b/caddy/Caddyfile.zhiyuan @@ -186,6 +186,7 @@ https://mirrors.sjtug.sjtu.edu.cn { not path /docker-registry/* not path /google-fonts/* not path /anaconda/* + not path /nspawn/* not path /anthon/* not path /leopardsh/* not path /endeavouros/* @@ -553,6 +554,10 @@ https://mirrors.sjtug.sjtu.edu.cn { @hidden path */.* respond @hidden 404 } + redir /nspawn /nspawn/ 301 + handle_path /nspawn/* { + redir * https://mirror.sjtu.edu.cn/nspawn{uri} 302 + } redir /anthon /anthon/ 301 handle_path /anthon/* { redir * https://mirror.sjtu.edu.cn/anthon{uri} 302 diff --git a/config.siyuan.yaml b/config.siyuan.yaml index a281de7..d1e3836 100644 --- a/config.siyuan.yaml +++ b/config.siyuan.yaml @@ -36,6 +36,15 @@ repos: # no_redir_http: true # <<: *oneshot_common + # nspawn + - type: shell_script + name: nspawn + script: /worker-script/rsync-fetcher.sh + interval: 6901 + source: rsync://hub.nspawn.org/containers + serve_mode: rsync_gateway + <<: *rsync_fetcher_common + <<: *oneshot_common # anthon - type: shell_script name: anthon diff --git a/rsync-gateway/config.siyuan.toml b/rsync-gateway/config.siyuan.toml index 25393e8..c0a878e 100644 --- a/rsync-gateway/config.siyuan.toml +++ b/rsync-gateway/config.siyuan.toml @@ -7,6 +7,11 @@ database_url = "postgres://rsync-sjtug@postgres/rsync-sjtug" format = "json" target = "tcp://tunnel:5007" +[endpoints.nspawn] +namespace = "nspawn" +s3_bucket = "899a892efef34b1b944a19981040f55b-oss01" +s3_prefix = "rsync/nspawn" + [endpoints.anthon] namespace = "anthon" s3_bucket = "899a892efef34b1b944a19981040f55b-oss01"