caddy: remove speedtest (#454)

.github/workflows/lint.yml

@@ -41,7 +41,6 @@ jobs:
           cp ./secrets/docker-registry.ci.yml ./secrets/docker-registry.yml
           cp ./secrets/pg.env.example ./secrets/pg.env
           touch ./secrets/lug-secrets.sh
-          touch ./speedtest/settings.toml
       - name: verify config
         run: docker-compose -f docker-compose.yml -f docker-compose.${{ matrix.mirror }}.yml config
       - name: docker-compose build

.gitignore

@@ -5,5 +5,4 @@ docker-compose.override.yml
 .env
 /secrets
 .pytest_cache/
-speedtest/settings.toml
 venv/

README.md

@@ -10,4 +10,4 @@ For more information, refer to our [Wiki](https://github.com/sjtug/mirror-docker
 
 ## License
 
-Apache 2.0, except `speedtest`, which is licensed under GPL 3.
+Apache 2.0

caddy-gen/src/caddy-gen.py

@@ -127,11 +127,11 @@ def gen_repos(base: str, repos: dict, first_site: bool, site: str) -> tuple[list
 
     http_file_server_nodes = []
     http_git_server_nodes = []
-    http_gzip_disabled_list = ["speedtest"]
+    http_gzip_disabled_list = []
 
     https_file_server_nodes = []
     https_git_server_nodes = []
-    https_gzip_disabled_list = ["speedtest"]
+    https_gzip_disabled_list = []
 
     for repo_ in repos:
         repo = dict_to_repo(repo_)
@@ -180,14 +180,6 @@ def gen_repos(base: str, repos: dict, first_site: bool, site: str) -> tuple[list
     http_file_server_nodes += http_git_server_nodes
     https_file_server_nodes += https_git_server_nodes
 
-    speed_test_nodes = [BLANK_NODE,
-                        Node('redir /speedtest /speedtest/ 308'),
-                        Node('handle_path /speedtest/*', [
-                            Node(f'reverse_proxy {SPEEDTEST_ADDR}')
-                        ])]
-    http_file_server_nodes += speed_test_nodes
-    https_file_server_nodes += speed_test_nodes
-
     # disable gzip for all proxy repos
     http_gzip_disabled = [Node(
         '@gzip_enabled', [Node(f'not path /{prefix}/*') for prefix in http_gzip_disabled_list])]

caddy-gen/src/config.py

@@ -5,7 +5,6 @@
 }
 
 LUG_ADDR = 'lug:7001'
-SPEEDTEST_ADDR = 'speedtest:8989'
 FRONTEND_DIR = '/dists'
 NODE_EXPORTER_ADDR = '172.31.0.1:9100'
 CADVISOR_ADDR = 'cadvisor:8080'

caddy/Caddyfile.siyuan

@@ -18,7 +18,6 @@ http://mirror.sjtu.edu.cn {
     header * x-sjtug-mirror-id siyuan
 
     @gzip_enabled {
-        not path /speedtest/*
         not path /docker-ce/*
     }
     encode @gzip_enabled gzip zstd
@@ -127,11 +126,6 @@ http://mirror.sjtu.edu.cn {
         respond @hidden 404
     }
 
-
-    redir /speedtest /speedtest/ 308
-    handle_path /speedtest/* {
-        reverse_proxy speedtest:8989
-    }
 }
 
 https://mirror.sjtu.edu.cn {
@@ -192,7 +186,6 @@ https://mirror.sjtu.edu.cn {
     header /mirrorz/* Access-Control-Request-Method GET
 
     @gzip_enabled {
-        not path /speedtest/*
         not path /nspawn/*
         not path /anthon/*
         not path /leopardsh/*
@@ -1168,10 +1161,5 @@ https://mirror.sjtu.edu.cn {
     handle_path /git/qemu.git/* {
         redir * https://mirrors.sjtug.sjtu.edu.cn/git/qemu.git{uri} 302
     }
-
-    redir /speedtest /speedtest/ 308
-    handle_path /speedtest/* {
-        reverse_proxy speedtest:8989
-    }
 }
 

caddy/Caddyfile.zhiyuan

@@ -75,7 +75,6 @@ http://mirrors.sjtug.sjtu.edu.cn {
     header * x-sjtug-mirror-id zhiyuan
 
     @gzip_enabled {
-        not path /speedtest/*
         not path /raspbian/*
     }
     encode @gzip_enabled gzip zstd
@@ -103,11 +102,6 @@ http://mirrors.sjtug.sjtu.edu.cn {
         respond @hidden 404
     }
 
-
-    redir /speedtest /speedtest/ 308
-    handle_path /speedtest/* {
-        reverse_proxy speedtest:8989
-    }
 }
 
 https://mirrors.sjtug.sjtu.edu.cn {
@@ -168,7 +162,6 @@ https://mirrors.sjtug.sjtu.edu.cn {
     header /mirrorz/* Access-Control-Request-Method GET
 
     @gzip_enabled {
-        not path /speedtest/*
         not path /kali-images/*
         not path /git/homebrew-core.git/*
         not path /git/homebrew-cask.git/*
@@ -1087,10 +1080,5 @@ https://mirrors.sjtug.sjtu.edu.cn {
     handle_path /git/lean4-packages/mathematics_in_lean/* {
         redir * https://mirror.sjtu.edu.cn/git/lean4-packages/mathematics_in_lean{uri} 302
     }
-
-    redir /speedtest /speedtest/ 308
-    handle_path /speedtest/* {
-        reverse_proxy speedtest:8989
-    }
 }
 

docker-compose.ci.yml

@@ -23,11 +23,6 @@ services:
       args:
         - USE_SJTUG=false
 
-  speedtest:
-    build:
-      args:
-        - USE_SJTUG=false
-
   git-backend:
     build:
       args:

docker-compose.yml

@@ -252,22 +252,6 @@ services:
     networks:
       - ipv6-service-net
 
-  speedtest:
-    build:
-      context: ./speedtest
-      args:
-        - USE_SJTUG=true
-        - SPEEDTEST_URL=v1.1.3/speedtest-go_1.1.3_linux_amd64.tar.gz
-    expose:
-      - 8989
-    logging:
-      options:
-        max-size: "2M"
-        max-file: "10"
-    restart: unless-stopped
-    networks:
-      - ipv6-service-net
-
 networks:
   host-monitor-net:
     driver: bridge