Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lug: move immortalwrt to zhiyuan #455

Merged
merged 1 commit into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions caddy/Caddyfile.siyuan
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ https://mirror.sjtu.edu.cn {
not path /git/lean4-packages/doc-gen4/*
not path /git/lean4-packages/mathematics_in_lean_source/*
not path /git/lean4-packages/mathematics_in_lean/*
not path /immortalwrt/*
not path /putty/*
not path /gentoo/*
not path /vim/*
Expand Down Expand Up @@ -346,15 +347,6 @@ https://mirror.sjtu.edu.cn {
@hidden path */.*
respond @hidden 404
}
redir /immortalwrt /immortalwrt/ 301
handle /immortalwrt/* {
file_server browse {
root /srv/data32T
hide .*
}
@hidden path */.*
respond @hidden 404
}
redir /rocky /rocky/ 301
handle /rocky/* {
file_server browse {
Expand Down Expand Up @@ -908,6 +900,10 @@ https://mirror.sjtu.edu.cn {
handle_path /ubuntu-cd/* {
redir * https://repo.huaweicloud.com/ubuntu-cdimage/{uri} 302
}
redir /immortalwrt /immortalwrt/ 301
handle_path /immortalwrt/* {
redir * https://mirrors.sjtug.sjtu.edu.cn/immortalwrt{uri} 302
}
redir /putty /putty/ 301
handle_path /putty/* {
redir * https://mirrors.sjtug.sjtu.edu.cn/putty{uri} 302
Expand Down
14 changes: 9 additions & 5 deletions caddy/Caddyfile.zhiyuan
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
not path /debian-cdimage/*
not path /packman/*
not path /pop-os/*
not path /immortalwrt/*
not path /rocky/*
not path /raspberry-pi-os-images/*
not path /archlinuxarm/*
Expand Down Expand Up @@ -309,6 +308,15 @@ https://mirrors.sjtug.sjtu.edu.cn {
}
encode @gzip_enabled gzip zstd

redir /immortalwrt /immortalwrt/ 301
handle /immortalwrt/* {
file_server browse {
root /mnt
hide .*
}
@hidden path */.*
respond @hidden 404
}
redir /putty /putty/ 301
handle /putty/* {
file_server browse {
Expand Down Expand Up @@ -575,10 +583,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
handle_path /pop-os/* {
redir * https://mirror.sjtu.edu.cn/pop-os{uri} 302
}
redir /immortalwrt /immortalwrt/ 301
handle_path /immortalwrt/* {
redir * https://mirror.sjtu.edu.cn/immortalwrt{uri} 302
}
redir /rocky /rocky/ 301
handle_path /rocky/* {
redir * https://mirror.sjtu.edu.cn/rocky{uri} 302
Expand Down
12 changes: 0 additions & 12 deletions config.siyuan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,6 @@ repos:
name: pop-os
<<: *oneshot_common
<<: *apt_common
# immortalwrt
- type: shell_script
script: /worker-script/rsync_password.sh
source: rsync://firmwarepublic@rsync-mirror.infra.immortalwrt.org/firmware-public
interval: 40401
path: /srv/data32T/immortalwrt
name: immortalwrt
# Password is made public at #319
# So we do not hide it behind secrets
password: immortalwrt-org
rsync_extra_flags: --exclude "/snapshots/" --exclude "/releases/*18.06*"
<<: *oneshot_common
# rocky
- type: shell_script
script: /worker-script/rsync.sh
Expand Down
12 changes: 12 additions & 0 deletions config.zhiyuan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@ dummy:
partial: 5

repos:
# immortalwrt
- type: shell_script
script: /worker-script/rsync_password.sh
source: rsync://firmwarepublic@rsync-mirror.infra.immortalwrt.org/firmware-public
interval: 40401
path: /mnt/immortalwrt
name: immortalwrt
# Password is made public at #319
# So we do not hide it behind secrets
password: immortalwrt-org
rsync_extra_flags: --exclude "/snapshots/" --exclude "/releases/*18.06*"
<<: *oneshot_common
- type: shell_script
script: /worker-script/rsync.sh
source: rsync://rsync.chiark.greenend.org.uk/ftp/users/sgtatham/putty-website-mirror/
Expand Down
Loading