use 1 smartdns for everything

.gitignore

+/dnsmasq-china-list
+/files/smartdns/china-list
+/files/smartdns/smartdns.conf

files/smartdns/china.conf

-bind-tcp [::]:53
-bind [::]:53
-
-tcp-idle-time 3
-cache-size 4096
-prefetch-domain yes
-
-serve-expired yes
-serve-expired-ttl 0
-
-speed-check-mode tcp:80,tcp:443,ping
-rr-ttl-min 1
-rr-ttl-max 86400
-
-log-level warn
-
-server 114.114.114.114
-server 114.114.115.115
-server 223.5.5.5
-server 223.6.6.6
-server 180.76.76.76
-server 119.29.29.29
-server 119.28.28.28
-server 1.2.4.8
-server 210.2.4.8

files/smartdns/tls.conf → files/smartdns/header.conf

@@ -20,3 +20,13 @@ server-tls 9.9.9.9
 server-tls 1.1.1.1
 server-tls 1.0.0.1
 server-https https://cloudflare-dns.com/dns-query
+
+server 114.114.114.114 -group china
+server 114.114.115.115 -group china
+server 223.5.5.5 -group china
+server 223.6.6.6 -group china
+server 180.76.76.76 -group china
+server 119.29.29.29 -group china
+server 119.28.28.28 -group china
+server 1.2.4.8 -group china
+server 210.2.4.8 -group china

gen.sh

+#!/bin/bash
+cd dnsmasq-china-list
+git pull
+make smartdns
+cd ..
+cp -rf ./files/smartdns/header.conf ./files/smartdns/smartdns.conf 
+sed 's/114.114.114.114/china/g' ./dnsmasq-china-list/*.smartdns.conf >> ./files/smartdns/smartdns.conf 
+grep -P '^bogus-nxdomain=.+$' dnsmasq-china-list/bogus-nxdomain.china.conf | sed 's/=/ /g' >> ./files/smartdns/smartdns.conf 

templates/docker-compose.yml.j2

@@ -18,17 +18,18 @@ services:
       - '53:53/udp'
     command: -f -x -c /etc/smartdns/smartdns.conf
     volumes:
-      - ./smartdns/tls.conf:/etc/smartdns/smartdns.conf:ro
+      - ./smartdns/smartdns.conf:/etc/smartdns/smartdns.conf:ro
+      - ./smartdns/china-list:/etc/smartdns/china-list:ro
 
-  smartdns-china:
-    restart: always
-    image:  {{smartdns_image}}
-    ports:
-      - '55:53'
-      - '55:53/udp'
-    command: -f -x -c /etc/smartdns/smartdns.conf
-    volumes:
-      - ./smartdns/china.conf:/etc/smartdns/smartdns.conf:ro
+  #smartdns-china:
+  #  restart: always
+  #  image:  {{smartdns_image}}
+  #  ports:
+  #    - '55:53'
+  #    - '55:53/udp'
+  #  command: -f -x -c /etc/smartdns/smartdns.conf
+  #  volumes:
+  #    - ./smartdns/china.conf:/etc/smartdns/smartdns.conf:ro
 
   apt-cacher-ng:
     restart: always