From 1e20bc472bab847831bc990abde17b528b6c73c3 Mon Sep 17 00:00:00 2001
From: Tsz Lung Chung <22969604+truc0@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:46:16 +0800
Subject: [PATCH] lug: fix service failed after migration (#498)

* lug: remove /dev/vdb mapping in docker-compose since the disk is removed
* docker: change path of database
* lug: auto select schema when redirect to ftp.sjtu
* lug: update pop-os release
---
 caddy/Caddyfile.siyuan    | 56 +++++++++++++++++++--------------------
 caddy/Caddyfile.zhiyuan   | 36 ++++++++++++-------------
 config.siyuan.yaml        | 38 +++++++++++++-------------
 docker-compose.siyuan.yml | 10 +------
 4 files changed, 66 insertions(+), 74 deletions(-)

diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan
index e1f8f51..e374224 100644
--- a/caddy/Caddyfile.siyuan
+++ b/caddy/Caddyfile.siyuan
@@ -34,27 +34,27 @@ http://mirror.sjtu.edu.cn {
 
     redir /debian /debian/ 301
     handle_path /debian/* {
-        redir * https://ftp.sjtu.edu.cn/debian{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/debian{uri} 302
     }
     redir /debian-security /debian-security/ 301
     handle_path /debian-security/* {
-        redir * https://ftp.sjtu.edu.cn/debian-security{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/debian-security{uri} 302
     }
     redir /deepin /deepin/ 301
     handle_path /deepin/* {
-        redir * https://ftp.sjtu.edu.cn/deepin{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/deepin{uri} 302
     }
     redir /docker-ce /docker-ce/ 301
     handle_path /docker-ce/* {
-        redir * https://ftp.sjtu.edu.cn/docker-ce{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/docker-ce{uri} 302
     }
     redir /fedora/linux /fedora/linux/ 301
     handle_path /fedora/linux/* {
-        redir * https://ftp.sjtu.edu.cn/fedora/linux{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora/linux{uri} 302
     }
     redir /fedora/epel /fedora/epel/ 301
     handle_path /fedora/epel/* {
-        redir * https://ftp.sjtu.edu.cn/fedora/epel{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora/epel{uri} 302
     }
     redir /fedora-secondary /fedora-secondary/ 301
     handle /fedora-secondary/* {
@@ -67,15 +67,15 @@ http://mirror.sjtu.edu.cn {
     }
     redir /opensuse /opensuse/ 301
     handle_path /opensuse/* {
-        redir * https://ftp.sjtu.edu.cn/opensuse{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/opensuse{uri} 302
     }
     redir /remi /remi/ 301
     handle_path /remi/* {
-        redir * https://ftp.sjtu.edu.cn/remi{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/remi{uri} 302
     }
     redir /ubuntu /ubuntu/ 301
     handle_path /ubuntu/* {
-        redir * https://ftp.sjtu.edu.cn/ubuntu/{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/ubuntu/{uri} 302
     }
     redir /ubuntu-ports /ubuntu-ports/ 301
     handle /ubuntu-ports/* {
@@ -110,7 +110,7 @@ http://mirror.sjtu.edu.cn {
     }
     redir /fedora /fedora/ 301
     handle_path /fedora/* {
-        redir * https://ftp.sjtu.edu.cn/fedora{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora{uri} 302
     }
 
 }
@@ -410,35 +410,35 @@ https://mirror.sjtu.edu.cn {
     }
     redir /debian /debian/ 301
     handle_path /debian/* {
-        redir * https://ftp.sjtu.edu.cn/debian{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/debian{uri} 302
     }
     redir /debian-cd /debian-cd/ 301
     handle_path /debian-cd/* {
-        redir * https://ftp.sjtu.edu.cn/debian-cd{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/debian-cd{uri} 302
     }
     redir /debian-security /debian-security/ 301
     handle_path /debian-security/* {
-        redir * https://ftp.sjtu.edu.cn/debian-security{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/debian-security{uri} 302
     }
     redir /deepin /deepin/ 301
     handle_path /deepin/* {
-        redir * https://ftp.sjtu.edu.cn/deepin{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/deepin{uri} 302
     }
     redir /deepin-cd /deepin-cd/ 301
     handle_path /deepin-cd/* {
-        redir * https://ftp.sjtu.edu.cn/deepin-cd{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/deepin-cd{uri} 302
     }
     redir /docker-ce /docker-ce/ 301
     handle_path /docker-ce/* {
-        redir * https://ftp.sjtu.edu.cn/docker-ce{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/docker-ce{uri} 302
     }
     redir /fedora/linux /fedora/linux/ 301
     handle_path /fedora/linux/* {
-        redir * https://ftp.sjtu.edu.cn/fedora/linux{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora/linux{uri} 302
     }
     redir /fedora/epel /fedora/epel/ 301
     handle_path /fedora/epel/* {
-        redir * https://ftp.sjtu.edu.cn/fedora/epel{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora/epel{uri} 302
     }
     redir /fedora-secondary /fedora-secondary/ 301
     handle /fedora-secondary/* {
@@ -451,19 +451,19 @@ https://mirror.sjtu.edu.cn {
     }
     redir /linuxmint /linuxmint/ 301
     handle_path /linuxmint/* {
-        redir * https://ftp.sjtu.edu.cn/linuxmint/packages{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/linuxmint/packages{uri} 302
     }
     redir /linuxmint-cd /linuxmint-cd/ 301
     handle_path /linuxmint-cd/* {
-        redir * https://ftp.sjtu.edu.cn/linuxmint-cd{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/linuxmint-cd{uri} 302
     }
     redir /mageia /mageia/ 301
     handle_path /mageia/* {
-        redir * https://ftp.sjtu.edu.cn/mageia{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/mageia{uri} 302
     }
     redir /opensuse /opensuse/ 301
     handle_path /opensuse/* {
-        redir * https://ftp.sjtu.edu.cn/opensuse{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/opensuse{uri} 302
     }
     redir /openkylin /openkylin/ 301
     handle /openkylin/* {
@@ -479,11 +479,11 @@ https://mirror.sjtu.edu.cn {
     }
     redir /openvz /openvz/ 301
     handle_path /openvz/* {
-        redir * https://ftp.sjtu.edu.cn/openvz{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/openvz{uri} 302
     }
     redir /remi /remi/ 301
     handle_path /remi/* {
-        redir * https://ftp.sjtu.edu.cn/remi{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/remi{uri} 302
     }
     redir /termux /termux/ 301
     handle /termux/* {
@@ -496,7 +496,7 @@ https://mirror.sjtu.edu.cn {
     }
     redir /ubuntu /ubuntu/ 301
     handle_path /ubuntu/* {
-        redir * https://ftp.sjtu.edu.cn/ubuntu/{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/ubuntu/{uri} 302
     }
     redir /ubuntu-releases /ubuntu-releases/ 301
     handle /ubuntu-releases/* {
@@ -509,7 +509,7 @@ https://mirror.sjtu.edu.cn {
     }
     redir /ubuntu-cdimage /ubuntu-cdimage/ 301
     handle_path /ubuntu-cdimage/* {
-        redir * https://ftp.sjtu.edu.cn/ubuntu-cd{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/ubuntu-cd{uri} 302
     }
     redir /ubuntu-ports /ubuntu-ports/ 301
     handle /ubuntu-ports/* {
@@ -705,7 +705,7 @@ https://mirror.sjtu.edu.cn {
     }
     redir /fedora /fedora/ 301
     handle_path /fedora/* {
-        redir * https://ftp.sjtu.edu.cn/fedora{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora{uri} 302
     }
     redir /manjaro /manjaro/ 301
     handle /manjaro/* {
@@ -726,7 +726,7 @@ https://mirror.sjtu.edu.cn {
     }
     redir /archlinux /archlinux/ 301
     handle_path /archlinux/* {
-        redir * https://ftp.sjtu.edu.cn/archlinux{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/archlinux{uri} 302
     }
     redir /bioconductor /bioconductor/ 301
     handle /bioconductor/* {
diff --git a/caddy/Caddyfile.zhiyuan b/caddy/Caddyfile.zhiyuan
index 45c9df8..d224ee6 100644
--- a/caddy/Caddyfile.zhiyuan
+++ b/caddy/Caddyfile.zhiyuan
@@ -649,35 +649,35 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     redir /debian /debian/ 301
     handle_path /debian/* {
-        redir * https://ftp.sjtu.edu.cn/debian{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/debian{uri} 302
     }
     redir /debian-cd /debian-cd/ 301
     handle_path /debian-cd/* {
-        redir * https://ftp.sjtu.edu.cn/debian-cd{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/debian-cd{uri} 302
     }
     redir /debian-security /debian-security/ 301
     handle_path /debian-security/* {
-        redir * https://ftp.sjtu.edu.cn/debian-security{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/debian-security{uri} 302
     }
     redir /deepin /deepin/ 301
     handle_path /deepin/* {
-        redir * https://ftp.sjtu.edu.cn/deepin{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/deepin{uri} 302
     }
     redir /deepin-cd /deepin-cd/ 301
     handle_path /deepin-cd/* {
-        redir * https://ftp.sjtu.edu.cn/deepin-cd{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/deepin-cd{uri} 302
     }
     redir /docker-ce /docker-ce/ 301
     handle_path /docker-ce/* {
-        redir * https://ftp.sjtu.edu.cn/docker-ce{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/docker-ce{uri} 302
     }
     redir /fedora/linux /fedora/linux/ 301
     handle_path /fedora/linux/* {
-        redir * https://ftp.sjtu.edu.cn/fedora/linux{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora/linux{uri} 302
     }
     redir /fedora/epel /fedora/epel/ 301
     handle_path /fedora/epel/* {
-        redir * https://ftp.sjtu.edu.cn/fedora/epel{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora/epel{uri} 302
     }
     redir /fedora-secondary /fedora-secondary/ 301
     handle_path /fedora-secondary/* {
@@ -685,19 +685,19 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     redir /linuxmint /linuxmint/ 301
     handle_path /linuxmint/* {
-        redir * https://ftp.sjtu.edu.cn/linuxmint/packages{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/linuxmint/packages{uri} 302
     }
     redir /linuxmint-cd /linuxmint-cd/ 301
     handle_path /linuxmint-cd/* {
-        redir * https://ftp.sjtu.edu.cn/linuxmint-cd{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/linuxmint-cd{uri} 302
     }
     redir /mageia /mageia/ 301
     handle_path /mageia/* {
-        redir * https://ftp.sjtu.edu.cn/mageia{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/mageia{uri} 302
     }
     redir /opensuse /opensuse/ 301
     handle_path /opensuse/* {
-        redir * https://ftp.sjtu.edu.cn/opensuse{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/opensuse{uri} 302
     }
     redir /openkylin /openkylin/ 301
     handle_path /openkylin/* {
@@ -713,11 +713,11 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     redir /openvz /openvz/ 301
     handle_path /openvz/* {
-        redir * https://ftp.sjtu.edu.cn/openvz{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/openvz{uri} 302
     }
     redir /remi /remi/ 301
     handle_path /remi/* {
-        redir * https://ftp.sjtu.edu.cn/remi{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/remi{uri} 302
     }
     redir /termux /termux/ 301
     handle_path /termux/* {
@@ -725,7 +725,7 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     redir /ubuntu /ubuntu/ 301
     handle_path /ubuntu/* {
-        redir * https://ftp.sjtu.edu.cn/ubuntu/{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/ubuntu/{uri} 302
     }
     redir /ubuntu-releases /ubuntu-releases/ 301
     handle_path /ubuntu-releases/* {
@@ -733,7 +733,7 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     redir /ubuntu-cdimage /ubuntu-cdimage/ 301
     handle_path /ubuntu-cdimage/* {
-        redir * https://ftp.sjtu.edu.cn/ubuntu-cd{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/ubuntu-cd{uri} 302
     }
     redir /ubuntu-ports /ubuntu-ports/ 301
     handle_path /ubuntu-ports/* {
@@ -889,7 +889,7 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     redir /fedora /fedora/ 301
     handle_path /fedora/* {
-        redir * https://ftp.sjtu.edu.cn/fedora{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/fedora{uri} 302
     }
     redir /manjaro /manjaro/ 301
     handle_path /manjaro/* {
@@ -905,7 +905,7 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     redir /archlinux /archlinux/ 301
     handle_path /archlinux/* {
-        redir * https://ftp.sjtu.edu.cn/archlinux{uri} 302
+        redir * {scheme}://ftp.sjtu.edu.cn/archlinux{uri} 302
     }
     redir /bioconductor /bioconductor/ 301
     handle_path /bioconductor/* {
diff --git a/config.siyuan.yaml b/config.siyuan.yaml
index aa74f31..5b630b6 100644
--- a/config.siyuan.yaml
+++ b/config.siyuan.yaml
@@ -137,7 +137,7 @@ repos:
     source: https://apt.pop-os.org
     arch: "all,arm64,amd64,i386,src"
     # REMARK generate this list by script/popos_dists.sh
-    repo: "proprietary:bionic:main,proprietary:disco:main,proprietary:eoan:main,proprietary:focal:main,proprietary:groovy:main,proprietary:hirsute:main,proprietary:impish:main,proprietary:jammy:main,release:impish:main,release:jammy:main,staging/master:bionic:main,staging/master:focal:main,staging/master:jammy:main,staging-proprietary:bionic:main,staging-proprietary:disco:main,staging-proprietary:eoan:main,staging-proprietary:focal:main,staging-proprietary:groovy:main,staging-proprietary:hirsute:main,staging-proprietary:impish:main,staging-proprietary:jammy:main"
+    repo: "proprietary:bionic:main,proprietary:disco:main,proprietary:eoan:main,proprietary:focal:main,proprietary:groovy:main,proprietary:hirsute:main,proprietary:impish:main,proprietary:jammy:main,proprietary:noble:main,release:impish:main,release:jammy:main,release:noble:main,staging/master:focal:main,staging/master:jammy:main,staging/master:noble:main,staging-proprietary:bionic:main,staging-proprietary:disco:main,staging-proprietary:eoan:main,staging-proprietary:focal:main,staging-proprietary:groovy:main,staging-proprietary:hirsute:main,staging-proprietary:impish:main,staging-proprietary:jammy:main,staging-proprietary:noble:main"
     interval: 10601
     path: /srv/nfs27T/pop-os
     name: pop-os
@@ -199,54 +199,54 @@ repos:
   - type: external
     name: debian
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/debian
+    target: "{scheme}://ftp.sjtu.edu.cn/debian"
     no_redir_http: true
     <<: *oneshot_common
   # debian-cd
   - type: external
     name: debian-cd
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/debian-cd
+    target: "{scheme}://ftp.sjtu.edu.cn/debian-cd"
     <<: *oneshot_common
   # debian-security
   - type: external
     name: debian-security
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/debian-security
+    target: "{scheme}://ftp.sjtu.edu.cn/debian-security"
     no_redir_http: true
     <<: *oneshot_common
   # deepin
   - type: external
     name: deepin
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/deepin
+    target: "{scheme}://ftp.sjtu.edu.cn/deepin"
     no_redir_http: true
     <<: *oneshot_common
   # deepin-cd
   - type: external
     name: deepin-cd
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/deepin-cd
+    target: "{scheme}://ftp.sjtu.edu.cn/deepin-cd"
     <<: *oneshot_common
   # docker-ce
   - type: external
     name: docker-ce
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/docker-ce
+    target: "{scheme}://ftp.sjtu.edu.cn/docker-ce"
     no_redir_http: true
     <<: *oneshot_common
   # fedora/linux
   - type: external
     name: fedora/linux
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/fedora/linux
+    target: "{scheme}://ftp.sjtu.edu.cn/fedora/linux"
     no_redir_http: true
     <<: *oneshot_common
   # fedora/epel
   - type: external
     name: fedora/epel
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/fedora/epel
+    target: "{scheme}://ftp.sjtu.edu.cn/fedora/epel"
     no_redir_http: true
     <<: *oneshot_common
   # fedora-secondary
@@ -263,26 +263,26 @@ repos:
   - type: external
     name: linuxmint
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/linuxmint/packages
+    target: "{scheme}://ftp.sjtu.edu.cn/linuxmint/packages"
     <<: *oneshot_common
   # linuxmint-cd
   - type: external
     name: linuxmint-cd
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/linuxmint-cd
+    target: "{scheme}://ftp.sjtu.edu.cn/linuxmint-cd"
     <<: *oneshot_common
   # mageia
   - type: external
     name: mageia
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/mageia
+    target: "{scheme}://ftp.sjtu.edu.cn/mageia"
     disabled: true
     <<: *oneshot_common
   # opensuse
   - type: external
     name: opensuse
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/opensuse
+    target: "{scheme}://ftp.sjtu.edu.cn/opensuse"
     no_redir_http: true
     <<: *oneshot_common
   # openkylin
@@ -325,13 +325,13 @@ repos:
   - type: external
     name: openvz
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/openvz
+    target: "{scheme}://ftp.sjtu.edu.cn/openvz"
     <<: *oneshot_common
   # remi
   - type: external
     name: remi
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/remi
+    target: "{scheme}://ftp.sjtu.edu.cn/remi"
     no_redir_http: true
     <<: *oneshot_common
   # scientific
@@ -357,7 +357,7 @@ repos:
   - type: external
     name: ubuntu
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/ubuntu/
+    target: "{scheme}://ftp.sjtu.edu.cn/ubuntu/"
     no_redir_http: true
     <<: *oneshot_common
   # ubuntu-releases
@@ -372,7 +372,7 @@ repos:
   - type: external
     name: ubuntu-cdimage
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/ubuntu-cd
+    target: "{scheme}://ftp.sjtu.edu.cn/ubuntu-cd"
     <<: *oneshot_common
   # ubuntu-ports
   - type: shell_script
@@ -710,7 +710,7 @@ repos:
   - type: external
     name: fedora
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/fedora
+    target: "{scheme}://ftp.sjtu.edu.cn/fedora"
     no_redir_http: true
     <<: *oneshot_common
   - type: shell_script
@@ -737,7 +737,7 @@ repos:
   - type: external
     name: archlinux
     serve_mode: redir
-    target: https://ftp.sjtu.edu.cn/archlinux
+    target: "{scheme}://ftp.sjtu.edu.cn/archlinux"
     <<: *oneshot_common
   # bioconductor
   - type: shell_script
diff --git a/docker-compose.siyuan.yml b/docker-compose.siyuan.yml
index 4968059..5caa652 100644
--- a/docker-compose.siyuan.yml
+++ b/docker-compose.siyuan.yml
@@ -37,7 +37,7 @@ services:
     container_name: siyuan-postgres
     volumes:
       - './postgresql.siyuan.conf:/etc/postgresql/postgresql.conf:ro'
-      - "/mnt/nfs27T/postgres-data:/var/lib/postgresql/data"
+      - '/srv/mirror/postgres-data:/var/lib/postgresql/data'
     mem_limit: 30G
     memswap_limit: 30G
 
@@ -92,14 +92,6 @@ services:
       - ./rsyncd/rsyncd.siyuan.conf:/etc/rsyncd.conf:ro
       - /mnt/nfs27T:/srv/nfs27T:ro
       - ./rsyncd/motd.siyuan:/etc/rsync/motd:ro
-    blkio_config:
-      weight: 10
-      device_read_bps:
-        - path: /dev/vdb
-          rate: '10mb'
-      device_read_iops:
-        - path: /dev/vdb
-          rate: 20
 
   git-backend:
     container_name: siyuan-git-backend