lug: move almalinux & kali to zhiyuan (#458)

sjtug · Feb 8, 2024 · 613c039 · 613c039
1 parent b350eb5
commit 613c039
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 43 deletions.
diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan
@@ -278,6 +278,8 @@ https://mirror.sjtu.edu.cn {
         not path /git/lean4-packages/mathematics_in_lean_source/*
         not path /git/lean4-packages/mathematics_in_lean/*
         not path /git/lean4-packages/import-graph/*
+        not path /kali/*
+        not path /almalinux/*
         not path /immortalwrt/*
         not path /putty/*
         not path /gentoo/*
@@ -441,15 +443,6 @@ https://mirror.sjtu.edu.cn {
         @hidden path */.*
         respond @hidden 404
     }
-    redir /kali /kali/ 301
-    handle /kali/* {
-        file_server browse {
-            root /srv/data32T
-            hide .*
-        }
-        @hidden path */.*
-        respond @hidden 404
-    }
     redir /linuxmint /linuxmint/ 301
     handle /linuxmint/* {
         file_server browse {
@@ -811,15 +804,6 @@ https://mirror.sjtu.edu.cn {
         @hidden path */.*
         respond @hidden 404
     }
-    redir /almalinux /almalinux/ 301
-    handle /almalinux/* {
-        file_server browse {
-            root /srv/data32T
-            hide .*
-        }
-        @hidden path */.*
-        respond @hidden 404
-    }
     redir /kernel /kernel/ 301
     handle /kernel/* {
         reverse_proxy mirror-intel:8000
@@ -902,6 +886,14 @@ https://mirror.sjtu.edu.cn {
     handle_path /scientific/* {
         redir * https://mirrors.ustc.edu.cn/scientificlinux/{uri} 302
     }
+    redir /kali /kali/ 301
+    handle_path /kali/* {
+        redir * https://mirrors.sjtug.sjtu.edu.cn/kali{uri} 302
+    }
+    redir /almalinux /almalinux/ 301
+    handle_path /almalinux/* {
+        redir * https://mirrors.sjtug.sjtu.edu.cn/almalinux{uri} 302
+    }
     redir /immortalwrt /immortalwrt/ 301
     handle_path /immortalwrt/* {
         redir * https://mirrors.sjtug.sjtu.edu.cn/immortalwrt{uri} 302

diff --git a/caddy/Caddyfile.zhiyuan b/caddy/Caddyfile.zhiyuan
@@ -200,7 +200,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
         not path /deepin-cd/*
         not path /docker-ce/*
         not path /fedora-secondary/*
-        not path /kali/*
         not path /linuxmint/*
         not path /linuxmint-cd/*
         not path /mageia/*
@@ -277,7 +276,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
         not path /gimp/*
         not path /flutter_infra_release/*
         not path /armbian/*
-        not path /almalinux/*
         not path /kernel/*
         not path /git/linux.git/*
         not path /raspbian-addons/*
@@ -310,6 +308,24 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     encode @gzip_enabled gzip zstd
 
+    redir /kali /kali/ 301
+    handle /kali/* {
+        file_server browse {
+            root /mnt
+            hide .*
+        }
+        @hidden path */.*
+        respond @hidden 404
+    }
+    redir /almalinux /almalinux/ 301
+    handle /almalinux/* {
+        file_server browse {
+            root /mnt
+            hide .*
+        }
+        @hidden path */.*
+        respond @hidden 404
+    }
     redir /immortalwrt /immortalwrt/ 301
     handle /immortalwrt/* {
         file_server browse {
@@ -641,10 +657,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
     handle_path /fedora-secondary/* {
         redir * https://mirror.sjtu.edu.cn/fedora-secondary{uri} 302
     }
-    redir /kali /kali/ 301
-    handle_path /kali/* {
-        redir * https://mirror.sjtu.edu.cn/kali{uri} 302
-    }
     redir /linuxmint /linuxmint/ 301
     handle_path /linuxmint/* {
         redir * https://mirror.sjtu.edu.cn/linuxmint{uri} 302
@@ -897,10 +909,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
     handle_path /armbian/* {
         redir * https://mirror.sjtu.edu.cn/armbian{uri} 302
     }
-    redir /almalinux /almalinux/ 301
-    handle_path /almalinux/* {
-        redir * https://mirror.sjtu.edu.cn/almalinux{uri} 302
-    }
     redir /kernel /kernel/ 301
     handle /kernel/* {
         reverse_proxy mirror-intel:8000

diff --git a/config.siyuan.yaml b/config.siyuan.yaml
@@ -253,14 +253,6 @@ repos:
     rsync_extra_flags: --exclude "development/*" --exclude "extras/*" --exclude "*/debug/*"
     no_redir_http: true
     <<: *oneshot_common
-  # kali
-  - type: shell_script
-    script: /worker-script/rsync.sh
-    source: rsync://ftp.jaist.ac.jp/kali/
-    interval: 10800
-    path: /srv/data32T/kali
-    name: kali
-    <<: *oneshot_common
   # linuxmint
   - type: shell_script
     script: /worker-script/rsync.sh
@@ -861,13 +853,6 @@ repos:
     path: /srv/data32T/armbian
     name: armbian
     <<: *oneshot_common
-  - type: shell_script
-    script: /worker-script/rsync.sh
-    source: rsync://rsync.repo.almalinux.org/almalinux/
-    interval: 28800
-    path: /srv/data32T/almalinux
-    name: almalinux
-    <<: *oneshot_common
   - type: shell_script
     script: /worker-script/mirror-clone-v2.sh --workers 4 --target-type s3 --s3-prefix kernel --s3-buffer-path /var/cache --print-plan 100 rsync --http-base https://mirrors.tuna.tsinghua.edu.cn/kernel --rsync-base rsync://mirrors.tuna.tsinghua.edu.cn/kernel/
     serve_mode: mirror_intel

diff --git a/config.zhiyuan.yaml b/config.zhiyuan.yaml
@@ -24,6 +24,22 @@ dummy:
     partial: 5
 
 repos:
+  # kali
+  - type: shell_script
+    script: /worker-script/rsync.sh
+    source: rsync://ftp.jaist.ac.jp/kali/
+    interval: 10800
+    path: /mnt/kali
+    name: kali
+    <<: *oneshot_common
+  # almalinux
+  - type: shell_script
+    script: /worker-script/rsync.sh
+    source: rsync://rsync.repo.almalinux.org/almalinux/
+    interval: 28800
+    path: /mnt/almalinux
+    name: almalinux
+    <<: *oneshot_common
   # immortalwrt
   - type: shell_script
     script: /worker-script/rsync_password.sh