From aef295f8cc22bb9295af6bede7639488b1c017e5 Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Thu, 20 Jun 2024 17:52:41 -0700
Subject: [PATCH] .remove outdated srv

---
 datafile_gen_daemon_conf.py | 3 +--
 do.bash                     | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/datafile_gen_daemon_conf.py b/datafile_gen_daemon_conf.py
index 2d8f4c7..dac123d 100644
--- a/datafile_gen_daemon_conf.py
+++ b/datafile_gen_daemon_conf.py
@@ -3,7 +3,7 @@
 tests = [
         ('./do.bash frp-sg', '[proxy.] Reverse Proxy (Singapore FRP)'), 
         ('./do.bash frp-cdn', '[proxy-cdn.] Reverse Proxy (Seattle FRP)'), 
-        ('./do.bash www', '[www.] Main Website & Blog'), 
+        ('./do.bash www', '[www.] Website & Blog & API'), 
         ('./do.bash mail', '[mail.] Mail Server'), 
         ('./do.bash git', '[git.] Git'), 
         ('./do.bash drive', '[drive.] NextCloud WebDrive'), 
@@ -14,7 +14,6 @@ tests = [
         ('./do.bash cc-dns', 'recolic.cc DNS'), 
         ('./do.bash home-http', 'Home NAS & DDNS & HTTP'), 
         ('./do.bash domain2ip', 'Domain to IP'), 
-        ('./do.bash comm100', 'COMM100 Subscription'), 
 ][::-1]
 # ('./do.bash ddns-home', 'DDNS home'), 
 
diff --git a/do.bash b/do.bash
index 69ec9f2..aa67826 100755
--- a/do.bash
+++ b/do.bash
@@ -49,9 +49,6 @@ function do_test () {
         frp-cdn )
             test_tcp proxy-cdn.recolic.net 30999 || return $?
             ;;
-        comm100 )
-            curl -s -L https://www.rdev.sbs/ | grep Comm100 || return $?
-            ;;
         www )
             test_icmp recolic.net &&
             test_icmp www.recolic.net &&
@@ -95,6 +92,7 @@ function do_test () {
             test_tcp base.ddns1.recolic.net 22 | grep -a SSH || return $?
             ;;
         dl )
+            return $RETURN_CODE_SERVICE_CLOSE
             test_icmp dl.recolic.net &&
             curl -s -L https://dl.recolic.net/ | grep 'Home page is not provided for this download site' || return $?
             ;;
@@ -131,6 +129,7 @@ function do_test_twice () {
     return $?
 }
     
+# only used for local testing, might outdated
 if [[ "$1" = all ]]; then
     do_test_twice rproxy &&
     do_test_twice drive &&
-- 
GitLab