lug: remove scientificlinux (#457)

sjtug · Feb 5, 2024 · 85b2c66 · 85b2c66
1 parent 4544f94
commit 85b2c66
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan
@@ -266,6 +266,7 @@ https://mirror.sjtu.edu.cn {
         not path /github/SJTUThesis/*
         not path /centos/*
         not path /ubuntu-cd/*
+        not path /scientific/*
         not path /git/lean4-packages/std4/*
         not path /git/lean4-packages/lean4-cli/*
         not path /git/lean4-packages/ProofWidgets4/*
@@ -499,15 +500,6 @@ https://mirror.sjtu.edu.cn {
         @hidden path */.*
         respond @hidden 404
     }
-    redir /scientific /scientific/ 301
-    handle /scientific/* {
-        file_server browse {
-            root /srv/data32T
-            hide .*
-        }
-        @hidden path */.*
-        respond @hidden 404
-    }
     redir /termux /termux/ 301
     handle /termux/* {
         file_server browse {
@@ -900,6 +892,10 @@ https://mirror.sjtu.edu.cn {
     handle_path /ubuntu-cd/* {
         redir * https://repo.huaweicloud.com/ubuntu-cdimage/{uri} 302
     }
+    redir /scientific /scientific/ 301
+    handle_path /scientific/* {
+        redir * https://mirrors.ustc.edu.cn/scientificlinux/{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
@@ -209,7 +209,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
         not path /mx-packages/*
         not path /openvz/*
         not path /remi/*
-        not path /scientific/*
         not path /termux/*
         not path /ubuntu/*
         not path /ubuntu-cdimage/*
@@ -296,6 +295,7 @@ https://mirrors.sjtug.sjtu.edu.cn {
         not path /github/SJTUThesis/*
         not path /centos/*
         not path /ubuntu-cd/*
+        not path /scientific/*
         not path /git/lean4-packages/std4/*
         not path /git/lean4-packages/lean4-cli/*
         not path /git/lean4-packages/ProofWidgets4/*
@@ -675,10 +675,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
     handle_path /remi/* {
         redir * https://mirror.sjtu.edu.cn/remi{uri} 302
     }
-    redir /scientific /scientific/ 301
-    handle_path /scientific/* {
-        redir * https://mirror.sjtu.edu.cn/scientific{uri} 302
-    }
     redir /termux /termux/ 301
     handle_path /termux/* {
         redir * https://mirror.sjtu.edu.cn/termux{uri} 302
@@ -947,6 +943,10 @@ https://mirrors.sjtug.sjtu.edu.cn {
     handle_path /ubuntu-cd/* {
         redir * https://repo.huaweicloud.com/ubuntu-cdimage/{uri} 302
     }
+    redir /scientific /scientific/ 301
+    handle_path /scientific/* {
+        redir * https://mirrors.ustc.edu.cn/scientificlinux/{uri} 302
+    }
 
     redir /git/homebrew-core.git /git/homebrew-core.git/ 301
     handle /git/homebrew-core.git/* {

diff --git a/config.siyuan.yaml b/config.siyuan.yaml
@@ -339,15 +339,15 @@ repos:
     no_redir_http: true
     <<: *oneshot_common
   # scientific
-  - type: shell_script
-    script: /worker-script/rsync.sh
-    source: rsync://mirror.aarnet.edu.au/pub/scientific/
-    interval: 21600 # may be wrong
-    path: /srv/data32T/scientific
-    name: scientific
-    rsync_extra_flags: --exclude "*/obsolete/*" --exclude "obsolete" --exclude "stats"
-    ignore_vanish: true
-    <<: *oneshot_common
+  # - type: shell_script
+  #   script: /worker-script/rsync.sh
+  #   source: rsync://mirror.aarnet.edu.au/pub/scientific/
+  #   interval: 21600 # may be wrong
+  #   path: /srv/data32T/scientific
+  #   name: scientific
+  #   rsync_extra_flags: --exclude "*/obsolete/*" --exclude "obsolete" --exclude "stats"
+  #   ignore_vanish: true
+  #   <<: *oneshot_common
   # termux
   - type: shell_script
     script: /worker-script/rsync.sh
@@ -995,6 +995,12 @@ repos:
     target: https://repo.huaweicloud.com/ubuntu-cdimage/
     disabled: true
     <<: *oneshot_common
+  - type: external
+    name: scientific
+    serve_mode: redir
+    target: https://mirrors.ustc.edu.cn/scientificlinux/
+    disabled: true
+    <<: *oneshot_common
   # mathlib
   - type: shell_script
     script: /worker-script/git.sh