diff --git a/datafile_gen_daemon_conf.py b/datafile_gen_daemon_conf.py index 9bb29b870e821a18e5f3a8569542401e0182eedd..8771fe6f47320c2d6f64d4ca2d4bfc53d6b5dae1 100644 --- a/datafile_gen_daemon_conf.py +++ b/datafile_gen_daemon_conf.py @@ -7,6 +7,7 @@ tests = [ ('./do.bash frp-hk', 'Reverse Proxy (HongKong 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'), ('./do.bash mail', 'Mail Server'), @@ -15,12 +16,12 @@ tests = [ ('./do.bash zhixiang', 'ZhiXiang Fucker'), ('./do.bash mc', 'Minecraft Server'), ('./do.bash push-httpdb-agent', 'httpdb'), - ('./do.bash ddns-home', 'DDNS home'), ('./do.bash dl', 'Download Site'), ('./do.bash shortlink', 'Short Link'), ('./do.bash cc-dns', 'recolic.cc DNS'), ('./do.bash home-http', 'Home NAS with HTTP'), ] +# ('./do.bash ddns-home', 'DDNS home'), test_interval = 20 * 60 # 20min diff --git a/do.bash b/do.bash index f5deb0bf321b7bbf8b2e003cebad23f18a79c008..36ddcb293c4936c5d0f5f8b276ba08114da878f0 100755 --- a/do.bash +++ b/do.bash @@ -50,6 +50,9 @@ function do_test () { ss-us12 ) test_tcp base.us12.recolic.net 25551 || return $? ;; + ss-hk2 ) + test_tcp base.hk2.recolic.net 25551 || return $? + ;; ss-iplc ) test_tcp base.cnjp1.recolic.net 25551 || return $? test_tcp base.cnjp1.recolic.net 25552 || return $? @@ -113,8 +116,6 @@ function do_test () { curl -k -X POST -s 'https://api.anjie-elec.cn/api/usewater/Add?accessToken=FUCKYOU' | grep '104871845A503324' || return $? ;; mc ) - return $RETURN_CODE_SERVICE_CLOSE - test_icmp mc.recolic.net && test_tcp mc.recolic.net 25565 || return $? ;; push-httpdb-agent ) @@ -160,7 +161,7 @@ function do_test () { } function do_test_twice () { - do_test "$1" || do_test "$1" + do_test "$1" || do_test "$1" || do_test "$1" return $? } @@ -170,6 +171,7 @@ if [[ "$1" = all ]]; then do_test_twice v-tw && do_test_twice frp-hk && do_test_twice ss-us12 && + do_test_twice ss-hk2 && do_test_twice ss-iplc && do_test_twice ovpn-tw && do_test_twice www &&