lug: move immortalwrt to zhiyuan (#455)

sjtug · Feb 4, 2024 · 4544f94 · 4544f94
1 parent bbe89e8
commit 4544f94
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan
@@ -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/*
@@ -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 {
@@ -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

diff --git a/caddy/Caddyfile.zhiyuan b/caddy/Caddyfile.zhiyuan
@@ -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/*
@@ -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 {
@@ -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

diff --git a/config.siyuan.yaml b/config.siyuan.yaml
@@ -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

diff --git a/config.zhiyuan.yaml b/config.zhiyuan.yaml
@@ -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/