From 93207f660a73d06c7c1bfbf217f5ccd3c10fc344 Mon Sep 17 00:00:00 2001 From: Samuel Huang Date: Sat, 28 Aug 2021 11:29:58 +1000 Subject: [PATCH] Set dokodemo-door as dnsmasq upstream --- Dockerfile.amd64 | 2 +- Dockerfile.arm | 2 +- Dockerfile.arm64 | 2 +- proxy-ltt.sh | 5 +++-- proxy-lttg.sh | 5 +++-- proxy-lttw.sh | 5 +++-- proxy-ltx.sh | 5 +++-- proxy-mtt.sh | 5 +++-- proxy-mttw.sh | 5 +++-- proxy-ttt.sh | 5 +++-- proxy-tttw.sh | 5 +++-- 11 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index eb235bf..b67e93a 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -33,7 +33,7 @@ RUN apk update && apk add bash openssl curl jq moreutils \ RUN npm config set unsafe-perm true RUN npm install -g qrcode-terminal -ENV DNSPORT="53" +RUN echo "server=127.0.0.1#5353" >/etc/dnsmasq.d/upstream.conf RUN sed -i "s/^socks4.*/socks5\t127.0.0.1 1080/g" /etc/proxychains/proxychains.conf diff --git a/Dockerfile.arm b/Dockerfile.arm index a8a5b41..983d9fd 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -33,7 +33,7 @@ RUN apk update && apk add bash openssl curl jq moreutils \ RUN npm config set unsafe-perm true RUN npm install -g qrcode-terminal -ENV DNSPORT="53" +RUN echo "server=127.0.0.1#5353" >/etc/dnsmasq.d/upstream.conf RUN sed -i "s/^socks4.*/socks5\t127.0.0.1 1080/g" /etc/proxychains/proxychains.conf diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 33feb8a..406f490 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -33,7 +33,7 @@ RUN apk update && apk add bash openssl curl jq moreutils \ RUN npm config set unsafe-perm true RUN npm install -g qrcode-terminal -ENV DNSPORT="53" +RUN echo "server=127.0.0.1#5353" >/etc/dnsmasq.d/upstream.conf RUN sed -i "s/^socks4.*/socks5\t127.0.0.1 1080/g" /etc/proxychains/proxychains.conf diff --git a/proxy-ltt.sh b/proxy-ltt.sh index 931eb81..d4d7017 100755 --- a/proxy-ltt.sh +++ b/proxy-ltt.sh @@ -50,12 +50,13 @@ Jproxy=`echo '{}' | jq --arg host "${host}" --argjson jvnext "${Jvnext}" --argjs Jdirect='{"tag": "direct", "protocol": "freedom", "settings": {}}' Jblocked='{"tag": "blocked", "protocol": "blackhole", "settings": {}}' +JibDKDEMO=`echo '{}' | jq '. +={"tag": "dns-in", "port":5353, "listen":"0.0.0.0", "protocol":"dokodemo-door", "settings":{"address": "1.1.1.1", "port":53, "network":"tcp,udp"}}' ` JibSOCKS=`echo '{}' | jq '. +={"tag": "socks", "port":1080, "listen":"0.0.0.0", "protocol":"socks", "settings":{"udp":true}}' ` JibHTTP=`echo '{}' | jq '. +={"tag": "http", "port":8123, "listen":"0.0.0.0", "protocol":"http"}' ` -jroot=`echo '{}' | jq --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ +jroot=`echo '{}' | jq --argjson jibdkdemo "${JibDKDEMO}" --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ --argjson jproxy "${Jproxy}" --argjson jdirect "${Jdirect}" --argjson jblocked "${Jblocked}" \ -'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` +'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibdkdemo, $jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` echo "$jroot" exit 0 diff --git a/proxy-lttg.sh b/proxy-lttg.sh index b4634a2..13740cc 100755 --- a/proxy-lttg.sh +++ b/proxy-lttg.sh @@ -51,12 +51,13 @@ Jproxy=`echo '{}' | jq --arg host "${host}" --argjson jvnext "${Jvnext}" --argjs Jdirect='{"tag": "direct", "protocol": "freedom", "settings": {}}' Jblocked='{"tag": "blocked", "protocol": "blackhole", "settings": {}}' +JibDKDEMO=`echo '{}' | jq '. +={"tag": "dns-in", "port":5353, "listen":"0.0.0.0", "protocol":"dokodemo-door", "settings":{"address": "1.1.1.1", "port":53, "network":"tcp,udp"}}' ` JibSOCKS=`echo '{}' | jq '. +={"tag": "socks", "port":1080, "listen":"0.0.0.0", "protocol":"socks", "settings":{"udp":true}}' ` JibHTTP=`echo '{}' | jq '. +={"tag": "http", "port":8123, "listen":"0.0.0.0", "protocol":"http"}' ` -jroot=`echo '{}' | jq --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ +jroot=`echo '{}' | jq --argjson jibdkdemo "${JibDKDEMO}" --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ --argjson jproxy "${Jproxy}" --argjson jdirect "${Jdirect}" --argjson jblocked "${Jblocked}" \ -'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` +'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibdkdemo, $jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` echo "$jroot" exit 0 diff --git a/proxy-lttw.sh b/proxy-lttw.sh index ea6075c..8f8eff6 100755 --- a/proxy-lttw.sh +++ b/proxy-lttw.sh @@ -51,12 +51,13 @@ Jproxy=`echo '{}' | jq --arg host "${host}" --argjson jvnext "${Jvnext}" --argjs Jdirect='{"tag": "direct", "protocol": "freedom", "settings": {}}' Jblocked='{"tag": "blocked", "protocol": "blackhole", "settings": {}}' +JibDKDEMO=`echo '{}' | jq '. +={"tag": "dns-in", "port":5353, "listen":"0.0.0.0", "protocol":"dokodemo-door", "settings":{"address": "1.1.1.1", "port":53, "network":"tcp,udp"}}' ` JibSOCKS=`echo '{}' | jq '. +={"tag": "socks", "port":1080, "listen":"0.0.0.0", "protocol":"socks", "settings":{"udp":true}}' ` JibHTTP=`echo '{}' | jq '. +={"tag": "http", "port":8123, "listen":"0.0.0.0", "protocol":"http"}' ` -jroot=`echo '{}' | jq --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ +jroot=`echo '{}' | jq --argjson jibdkdemo "${JibDKDEMO}" --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ --argjson jproxy "${Jproxy}" --argjson jdirect "${Jdirect}" --argjson jblocked "${Jblocked}" \ -'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` +'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibdkdemo, $jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` echo "$jroot" exit 0 diff --git a/proxy-ltx.sh b/proxy-ltx.sh index b570f84..a574ea3 100755 --- a/proxy-ltx.sh +++ b/proxy-ltx.sh @@ -50,12 +50,13 @@ Jproxy=`echo '{}' | jq --arg host "${host}" --argjson jvnext "${Jvnext}" --argjs Jdirect='{"tag": "direct", "protocol": "freedom", "settings": {}}' Jblocked='{"tag": "blocked", "protocol": "blackhole", "settings": {}}' +JibDKDEMO=`echo '{}' | jq '. +={"tag": "dns-in", "port":5353, "listen":"0.0.0.0", "protocol":"dokodemo-door", "settings":{"address": "1.1.1.1", "port":53, "network":"tcp,udp"}}' ` JibSOCKS=`echo '{}' | jq '. +={"tag": "socks", "port":1080, "listen":"0.0.0.0", "protocol":"socks", "settings":{"udp":true}}' ` JibHTTP=`echo '{}' | jq '. +={"tag": "http", "port":8123, "listen":"0.0.0.0", "protocol":"http"}' ` -jroot=`echo '{}' | jq --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ +jroot=`echo '{}' | jq --argjson jibdkdemo "${JibDKDEMO}" --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ --argjson jproxy "${Jproxy}" --argjson jdirect "${Jdirect}" --argjson jblocked "${Jblocked}" \ -'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` +'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibdkdemo, $jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` echo "$jroot" exit 0 diff --git a/proxy-mtt.sh b/proxy-mtt.sh index 848d206..cc6b694 100755 --- a/proxy-mtt.sh +++ b/proxy-mtt.sh @@ -57,12 +57,13 @@ Jproxy=`echo '{}' | jq --arg host "${host}" --argjson jvnext "${Jvnext}" --argjs Jdirect='{"tag": "direct", "protocol": "freedom", "settings": {}}' Jblocked='{"tag": "blocked", "protocol": "blackhole", "settings": {}}' +JibDKDEMO=`echo '{}' | jq '. +={"tag": "dns-in", "port":5353, "listen":"0.0.0.0", "protocol":"dokodemo-door", "settings":{"address": "1.1.1.1", "port":53, "network":"tcp,udp"}}' ` JibSOCKS=`echo '{}' | jq '. +={"tag": "socks", "port":1080, "listen":"0.0.0.0", "protocol":"socks", "settings":{"udp":true}}' ` JibHTTP=`echo '{}' | jq '. +={"tag": "http", "port":8123, "listen":"0.0.0.0", "protocol":"http"}' ` -jroot=`echo '{}' | jq --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ +jroot=`echo '{}' | jq --argjson jibdkdemo "${JibDKDEMO}" --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ --argjson jproxy "${Jproxy}" --argjson jdirect "${Jdirect}" --argjson jblocked "${Jblocked}" \ -'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` +'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibdkdemo, $jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` echo "$jroot" exit 0 diff --git a/proxy-mttw.sh b/proxy-mttw.sh index 2cb44ea..8fb1a0c 100755 --- a/proxy-mttw.sh +++ b/proxy-mttw.sh @@ -51,12 +51,13 @@ Jproxy=`echo '{}' | jq --arg host "${host}" --argjson jvnext "${Jvnext}" --argjs Jdirect='{"tag": "direct", "protocol": "freedom", "settings": {}}' Jblocked='{"tag": "blocked", "protocol": "blackhole", "settings": {}}' +JibDKDEMO=`echo '{}' | jq '. +={"tag": "dns-in", "port":5353, "listen":"0.0.0.0", "protocol":"dokodemo-door", "settings":{"address": "1.1.1.1", "port":53, "network":"tcp,udp"}}' ` JibSOCKS=`echo '{}' | jq '. +={"tag": "socks", "port":1080, "listen":"0.0.0.0", "protocol":"socks", "settings":{"udp":true}}' ` JibHTTP=`echo '{}' | jq '. +={"tag": "http", "port":8123, "listen":"0.0.0.0", "protocol":"http"}' ` -jroot=`echo '{}' | jq --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ +jroot=`echo '{}' | jq --argjson jibdkdemo "${JibDKDEMO}" --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ --argjson jproxy "${Jproxy}" --argjson jdirect "${Jdirect}" --argjson jblocked "${Jblocked}" \ -'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` +'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibdkdemo, $jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` echo "$jroot" exit 0 diff --git a/proxy-ttt.sh b/proxy-ttt.sh index 3dd80d7..99c04ec 100755 --- a/proxy-ttt.sh +++ b/proxy-ttt.sh @@ -54,12 +54,13 @@ Jproxy=`echo '{}' | jq --arg host "${host}" --argjson jservers "${Jservers}" --a Jdirect='{"tag": "direct", "protocol": "freedom", "settings": {}}' Jblocked='{"tag": "blocked", "protocol": "blackhole", "settings": {}}' +JibDKDEMO=`echo '{}' | jq '. +={"tag": "dns-in", "port":5353, "listen":"0.0.0.0", "protocol":"dokodemo-door", "settings":{"address": "1.1.1.1", "port":53, "network":"tcp,udp"}}' ` JibSOCKS=`echo '{}' | jq '. +={"tag": "socks", "port":1080, "listen":"0.0.0.0", "protocol":"socks", "settings":{"udp":true}}' ` JibHTTP=`echo '{}' | jq '. +={"tag": "http", "port":8123, "listen":"0.0.0.0", "protocol":"http"}' ` -jroot=`echo '{}' | jq --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ +jroot=`echo '{}' | jq --argjson jibdkdemo "${JibDKDEMO}" --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ --argjson jproxy "${Jproxy}" --argjson jdirect "${Jdirect}" --argjson jblocked "${Jblocked}" \ -'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` +'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibdkdemo, $jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` echo "$jroot" exit 0 diff --git a/proxy-tttw.sh b/proxy-tttw.sh index a67fe7f..2d71e56 100755 --- a/proxy-tttw.sh +++ b/proxy-tttw.sh @@ -54,12 +54,13 @@ Jproxy=`echo '{}' | jq --arg host "${host}" --argjson jservers "${Jservers}" --a Jdirect='{"tag": "direct", "protocol": "freedom", "settings": {}}' Jblocked='{"tag": "blocked", "protocol": "blackhole", "settings": {}}' +JibDKDEMO=`echo '{}' | jq '. +={"tag": "dns-in", "port":5353, "listen":"0.0.0.0", "protocol":"dokodemo-door", "settings":{"address": "1.1.1.1", "port":53, "network":"tcp,udp"}}' ` JibSOCKS=`echo '{}' | jq '. +={"tag": "socks", "port":1080, "listen":"0.0.0.0", "protocol":"socks", "settings":{"udp":true}}' ` JibHTTP=`echo '{}' | jq '. +={"tag": "http", "port":8123, "listen":"0.0.0.0", "protocol":"http"}' ` -jroot=`echo '{}' | jq --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ +jroot=`echo '{}' | jq --argjson jibdkdemo "${JibDKDEMO}" --argjson jibsocks "${JibSOCKS}" --argjson jibhttp "${JibHTTP}" \ --argjson jproxy "${Jproxy}" --argjson jdirect "${Jdirect}" --argjson jblocked "${Jblocked}" \ -'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` +'. += {"log":{"loglevel":"warning"}, "inbounds":[$jibdkdemo, $jibsocks, $jibhttp], "outbounds":[$jproxy, $jdirect, $jblocked]}' ` echo "$jroot" exit 0