Merge branch 'master' of git.mycard.moe:mycard/utility

templates/docker-compose.yml.j2

@@ -36,6 +36,7 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
 
+{% if not web_port_occupied %}
   squid:
     restart: always
     image: datadog/squid
@@ -48,7 +49,6 @@ services:
       - '8080:3128'
 {% endif %}
 
-{% if not web_port_occupied %}
   apt-cacher-ng:
     restart: always
     build: apt-cacher-ng-docker

templates/smartdns/header.conf.j2

@@ -4,6 +4,7 @@ bind [::]:53
 tcp-idle-time 3
 cache-size 4096
 prefetch-domain yes
+dualstack-ip-selection yes
 
 serve-expired yes
 serve-expired-ttl 0
@@ -28,9 +29,9 @@ server-tls 1.0.0.1 -group tls
 #server-https https://cloudflare-dns.com/dns-query -group tls
 
 server 114.114.114.114 -group china -exclude-default-group
-#server 114.114.115.115 -group china -exclude-default-group
+server 114.114.115.115 -group china -exclude-default-group
 server 223.5.5.5 -group china -exclude-default-group
-#server 223.6.6.6 -group china -exclude-default-group
+server 223.6.6.6 -group china -exclude-default-group
 #server 180.76.76.76 -group china -exclude-default-group
 #server 119.29.29.29 -group china -exclude-default-group
 #server 119.28.28.28 -group china -exclude-default-group