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.

Sign up for GitHub

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

Jump to bottom

caddy-gen: fix redirection on http #292

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

caddy-gen: fix redirection on http #292

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba5f56b
fix redirection on http
stneng Oct 4, 2021
c19a3c6
caddy-gen: fix redirection on http
stneng Oct 4, 2021
9ebb8c4
caddy-gen: fix redirection on http
stneng Oct 4, 2021
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
4 changes: 2 additions & 2 deletions caddy-gen/src/caddy-gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def build_root(base, config_yaml: dict, first_site: bool, site: str) -> Node:
main_children += [sjtug_mirror_id(site)] # SJTUG mirror ID header
main_children += cors("/mirrorz/*") # mirrorz.org protocol support
main_children += [BLANK_NODE] + file_server_nodes
main_node = Node(f'{base}', main_children)
main_node = Node(f'{base}, http://{base}', main_children)
http_base = Node(f'http://{base}/', log() + [
Node(f'redir / https://{base}/ 308')
])
Expand All @@ -215,7 +215,7 @@ def rewrite_config(repo: dict, site: str):
return {
'name': name,
'serve_mode': 'redir',
'target': f'https://{BASES[site][0]}/{name}'
'target': f'{{scheme}}://{BASES[site][0]}/{name}'
}
if serve_mode == 'redir' or serve_mode == 'redir_force':
return {
Expand Down
70 changes: 35 additions & 35 deletions caddy/Caddyfile.siyuan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ http://mirror.sjtu.edu.cn/speedtest/* {
header * x-sjtug-mirror-id siyuan
}

mirror.sjtu.edu.cn {
mirror.sjtu.edu.cn, http://mirror.sjtu.edu.cn {
log {
output stdout
format single_field common_log # log in v1 style
Expand Down Expand Up @@ -797,72 +797,72 @@ mirror.sjtu.edu.cn {
redir /putty /putty/ 301
route /putty/* {
uri strip_prefix /putty
redir * https://mirrors.sjtug.sjtu.edu.cn/putty{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/putty{uri} 302
}
redir /archlinux-cn /archlinux-cn/ 301
route /archlinux-cn/* {
uri strip_prefix /archlinux-cn
redir * https://mirrors.sjtug.sjtu.edu.cn/archlinux-cn{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/archlinux-cn{uri} 302
}
redir /archlinuxarm /archlinuxarm/ 301
route /archlinuxarm/* {
uri strip_prefix /archlinuxarm
redir * https://mirrors.sjtug.sjtu.edu.cn/archlinuxarm{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/archlinuxarm{uri} 302
}
redir /gentoo /gentoo/ 301
route /gentoo/* {
uri strip_prefix /gentoo
redir * https://mirrors.sjtug.sjtu.edu.cn/gentoo{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/gentoo{uri} 302
}
redir /vim /vim/ 301
route /vim/* {
uri strip_prefix /vim
redir * https://mirrors.sjtug.sjtu.edu.cn/vim{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/vim{uri} 302
}
redir /alpine /alpine/ 301
route /alpine/* {
uri strip_prefix /alpine
redir * https://mirrors.sjtug.sjtu.edu.cn/alpine{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/alpine{uri} 302
}
redir /cpan /cpan/ 301
route /cpan/* {
uri strip_prefix /cpan
redir * https://mirrors.sjtug.sjtu.edu.cn/cpan{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/cpan{uri} 302
}
redir /cran /cran/ 301
route /cran/* {
uri strip_prefix /cran
redir * https://mirrors.sjtug.sjtu.edu.cn/cran{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/cran{uri} 302
}
redir /ctex /ctex/ 301
route /ctex/* {
uri strip_prefix /ctex
redir * https://mirrors.sjtug.sjtu.edu.cn/ctex{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/ctex{uri} 302
}
redir /gnu /gnu/ 301
route /gnu/* {
uri strip_prefix /gnu
redir * https://mirrors.sjtug.sjtu.edu.cn/gnu{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/gnu{uri} 302
}
redir /cygwin /cygwin/ 301
route /cygwin/* {
uri strip_prefix /cygwin
redir * https://mirrors.sjtug.sjtu.edu.cn/cygwin{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/cygwin{uri} 302
}
redir /ros /ros/ 301
route /ros/* {
uri strip_prefix /ros
redir * https://mirrors.sjtug.sjtu.edu.cn/ros{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/ros{uri} 302
}
redir /kali /kali/ 301
route /kali/* {
uri strip_prefix /kali
redir * https://mirrors.sjtug.sjtu.edu.cn/kali{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/kali{uri} 302
}
redir /kali-images /kali-images/ 301
route /kali-images/* {
uri strip_prefix /kali-images
redir * https://mirrors.sjtug.sjtu.edu.cn/kali-images{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/kali-images{uri} 302
}
redir /git/homebrew-core.git /git/homebrew-core.git/ 301
redir /git/homebrew-cask.git /git/homebrew-cask.git/ 301
Expand All @@ -871,79 +871,79 @@ mirror.sjtu.edu.cn {
redir /raspbian /raspbian/ 301
route /raspbian/* {
uri strip_prefix /raspbian
redir * https://mirrors.sjtug.sjtu.edu.cn/raspbian{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/raspbian{uri} 302
}
redir /parrot /parrot/ 301
route /parrot/* {
uri strip_prefix /parrot
redir * https://mirrors.sjtug.sjtu.edu.cn/parrot{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/parrot{uri} 302
}
redir /raspberrypi /raspberrypi/ 301
route /raspberrypi/* {
uri strip_prefix /raspberrypi
redir * https://mirrors.sjtug.sjtu.edu.cn/raspberrypi{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/raspberrypi{uri} 302
}
redir /mx-isos /mx-isos/ 301
route /mx-isos/* {
uri strip_prefix /mx-isos
redir * https://mirrors.sjtug.sjtu.edu.cn/mx-isos{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/mx-isos{uri} 302
}
redir /mx-packages /mx-packages/ 301
route /mx-packages/* {
uri strip_prefix /mx-packages
redir * https://mirrors.sjtug.sjtu.edu.cn/mx-packages{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/mx-packages{uri} 302
}
redir /packagist /packagist/ 301
route /packagist/* {
uri strip_prefix /packagist
redir * https://mirrors.sjtug.sjtu.edu.cn/packagist{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/packagist{uri} 302
}
redir /mongodb /mongodb/ 301
route /mongodb/* {
uri strip_prefix /mongodb
redir * https://mirrors.sjtug.sjtu.edu.cn/mongodb{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/mongodb{uri} 302
}
redir /qt /qt/ 301
route /qt/* {
uri strip_prefix /qt
redir * https://mirrors.sjtug.sjtu.edu.cn/qt{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/qt{uri} 302
}
redir /julia /julia/ 301
route /julia/* {
uri strip_prefix /julia
redir * https://mirrors.sjtug.sjtu.edu.cn/julia{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/julia{uri} 302
}
redir /emacs-elpa /emacs-elpa/ 301
route /emacs-elpa/* {
uri strip_prefix /emacs-elpa
redir * https://mirrors.sjtug.sjtu.edu.cn/emacs-elpa{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/emacs-elpa{uri} 302
}
redir /julia-releases /julia-releases/ 301
route /julia-releases/* {
uri strip_prefix /julia-releases
redir * https://mirrors.sjtug.sjtu.edu.cn/julia-releases{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/julia-releases{uri} 302
}
redir /raspberry-pi-os-images /raspberry-pi-os-images/ 301
route /raspberry-pi-os-images/* {
uri strip_prefix /raspberry-pi-os-images
redir * https://mirrors.sjtug.sjtu.edu.cn/raspberry-pi-os-images{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/raspberry-pi-os-images{uri} 302
}
redir /msys2 /msys2/ 301
route /msys2/* {
uri strip_prefix /msys2
redir * https://mirrors.sjtug.sjtu.edu.cn/msys2{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/msys2{uri} 302
}
redir /git/opam-repository.git /git/opam-repository.git/ 301
redir /git/qemu.git /git/qemu.git/ 301
redir /linuxliteos /linuxliteos/ 301
route /linuxliteos/* {
uri strip_prefix /linuxliteos
redir * https://mirrors.sjtug.sjtu.edu.cn/linuxliteos{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/linuxliteos{uri} 302
}
redir /download.flutter.io /download.flutter.io/ 301
route /download.flutter.io/* {
uri strip_prefix /download.flutter.io
redir * https://mirrors.sjtug.sjtu.edu.cn/download.flutter.io{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/download.flutter.io{uri} 302
}
redir /google-fonts /google-fonts/ 301
route /google-fonts/* {
Expand All @@ -953,27 +953,27 @@ mirror.sjtu.edu.cn {
redir /CPAN /CPAN/ 301
route /CPAN/* {
uri strip_prefix /CPAN
redir * https://mirrors.sjtug.sjtu.edu.cn/CPAN{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/CPAN{uri} 302
}
redir /CRAN /CRAN/ 301
route /CRAN/* {
uri strip_prefix /CRAN
redir * https://mirrors.sjtug.sjtu.edu.cn/CRAN{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/CRAN{uri} 302
}
redir /CTAN /CTAN/ 301
route /CTAN/* {
uri strip_prefix /CTAN
redir * https://mirrors.sjtug.sjtu.edu.cn/CTAN{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/CTAN{uri} 302
}
redir /ctan /ctan/ 301
route /ctan/* {
uri strip_prefix /ctan
redir * https://mirrors.sjtug.sjtu.edu.cn/ctan{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/ctan{uri} 302
}
redir /rocky /rocky/ 301
route /rocky/* {
uri strip_prefix /rocky
redir * https://mirrors.sjtug.sjtu.edu.cn/rocky{uri} 302
redir * {scheme}://mirrors.sjtug.sjtu.edu.cn/rocky{uri} 302
}

@git_libgit2 {
Expand Down
Loading