From baa68bd7f68a6e54cc5b10fece8179e129945f44 Mon Sep 17 00:00:00 2001
From: Recolic <git@me.recolic.net>
Date: Sun, 19 Mar 2023 02:04:49 -0700
Subject: [PATCH] update service list
---
datafile_gen_daemon_conf.py | 26 +++++++++------------
do.bash | 45 +++++--------------------------------
2 files changed, 16 insertions(+), 55 deletions(-)
diff --git a/datafile_gen_daemon_conf.py b/datafile_gen_daemon_conf.py
index 3681adb..bc63ce9 100644
--- a/datafile_gen_daemon_conf.py
+++ b/datafile_gen_daemon_conf.py
@@ -1,26 +1,20 @@
# datafile generator daemon config
tests = [
- ('./do.bash rproxy', 'Reverse Proxy (China FRP)'),
- ('./do.bash drive', 'Drive'),
- ('./do.bash v-tw', 'Project V taiwan'),
- ('./do.bash frp-sg', 'Reverse Proxy (Singapore FRP)'),
- ('./do.bash ss-iplc', 'Shadowsocks IPLC'), # Both CNIP and JPIP, requires linode to be working.
- ('./do.bash ss-us12', 'ShadowSocks US-12'),
- ('./do.bash ss-hk2', 'ShadowSocks HK-2'),
- ('./do.bash ovpn-tw', 'OpenVPN taiwan'),
- ('./do.bash www', 'Main Website & Blog'),
- ('./do.bash mail', 'Mail Server'),
- ('./do.bash tm', 'Teachermate Web Seller'),
- ('./do.bash git', 'Git'),
- ('./do.bash zhixiang', 'ZhiXiang Fucker'),
- ('./do.bash mc', 'Minecraft Server'),
- ('./do.bash push-httpdb-agent', 'httpdb'),
- ('./do.bash dl', 'Download Site'),
+ ('./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 mail', '[mail.] Mail Server'),
+ ('./do.bash git', '[git.] Git'),
+ ('./do.bash drive', '[drive.] NextCloud WebDrive'),
+ ('./do.bash drive2', '[drive2.] WebDrive2'),
+ ('./do.bash dl', '[dl.] Download Site'),
+ ('./do.bash mc', '[mc.] Minecraft Server'),
('./do.bash shortlink', 'Short Link'),
('./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'),
]
# ('./do.bash ddns-home', 'DDNS home'),
diff --git a/do.bash b/do.bash
index 9340d52..5106edf 100755
--- a/do.bash
+++ b/do.bash
@@ -40,28 +40,17 @@ function do_test () {
# NO icmp required because of udp2raw
curl -s https://drive.recolic.net/login | grep 'drive.recolic.' || return $?
;;
- v-tw )
- return $RETURN_CODE_SERVICE_CLOSE
- curl https://git.recolic.net/vr/test404 -vv 2>&1 | grep 404 || return $?
+ drive2 )
+ curl -s https://drive2.recolic.net/login | grep 'Recolic Cloud' || return $?
;;
frp-sg )
test_tcp proxy.recolic.net 30999 || return $?
;;
- ss-us12 )
- return $RETURN_CODE_SERVICE_CLOSE
- test_tcp base.us12.recolic.net 25551 || return $?
- ;;
- ss-hk2 )
- return $RETURN_CODE_SERVICE_CLOSE
- test_tcp base.hk2.recolic.net 25551 || return $?
+ frp-cdn )
+ test_tcp proxy-cdn.recolic.net 30999 || return $?
;;
- ss-iplc )
- return $RETURN_CODE_SERVICE_CLOSE
- test_tcp base.cnjp1.recolic.net 25551 || return $?
- test_tcp base.cnjp1.recolic.net 25552 || return $?
- ;;
- ovpn-tw )
- return $RETURN_CODE_SERVICE_CLOSE
+ comm100 )
+ curl -s -L https://www.comm100.pw/ | grep Comm100 || return $?
;;
www )
test_icmp recolic.net &&
@@ -93,36 +82,14 @@ function do_test () {
curl -s https://mail.recolic.net/mail/ | grep 'Welcome to Roundcube' || return $?
curl http://mail.recolic.net/ -vv 2>&1 | grep 'https://mail.recolic.net/' || return $?
;;
- tm )
- return $RETURN_CODE_SERVICE_CLOSE
- test_icmp tm.recolic.net &&
- curl -s https://tm.recolic.net/ | grep inputButtonCss &&
- curl -s http://tm.recolic.net/ -L | grep inputButtonCss || return $?
- curl -s 'https://tm.recolic.net/addtask?openid=23251fc131e118d07fc9932f3c3de92c&N=30.508914&E=114.40718&key=FUCKYOU' | grep 'invalid key' || return $?
- ;;
git )
# NO icmp required because of udp2raw
curl -s https://git.recolic.net/ | grep 'users/sign_in' &&
curl -s http://git.recolic.net/ -L | grep 'users/sign_in' || return $?
;;
- zhixiang )
- return $RETURN_CODE_SERVICE_CLOSE
- grep 'api.anjie-elec.cn' /etc/hosts || echo '123.206.117.183 api.anjie-elec.cn' >> /etc/hosts
- [[ $? != 0 ]] && echo 'Failed to edit hosts file! Unable to perform this test.' > /dev/fd/2 && return 0
- curl -k -X POST -s 'https://api.anjie-elec.cn/api/usewater/Add?accessToken=FUCKYOU' | grep '104871845A503324' || return $?
- ;;
mc )
test_tcp mc.recolic.net 25565 || return $?
;;
- push-httpdb-agent )
- return $RETURN_CODE_SERVICE_CLOSE
- local r="$RANDOM"
- test_icmp git.recolic.net &&
- curl -s "https://git.recolic.net/_r_testing/set/_status_test|$r" &&
- local result=$(curl -s "https://git.recolic.net/_r_testing/get/_status_test") || return $?
- [[ $r = $result ]]
- return $?
- ;;
ddns-home )
# NO icmp required.
test_tcp base.ddns1.recolic.net 22 | grep -a SSH || return $?
--
GitLab