update smartdns

.gitignore

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

defaults/main.yml

@@ -12,6 +12,7 @@ smartdns_ports:
   - 54
   - 55
 smartdns_disable_ipv6: false
+smartdns_cache_path: ./smartdns-cache
 kms_address: null
 squid_address: null
 apt_cacher_address: null

files/smartdns/.gitkeep

+1

gen.sh

@@ -4,6 +4,6 @@ git fetch origin master
 git reset --hard FETCH_HEAD
 make smartdns
 cd ..
-cp -rf ./templates/smartdns/header.conf.j2 ./templates/smartdns/smartdns.conf.j2
-sed 's/114.114.114.114/china/g' ./dnsmasq-china-list/*.smartdns.conf >> ./templates/smartdns/smartdns.conf.j2
-grep -P '^bogus-nxdomain=.+$' dnsmasq-china-list/bogus-nxdomain.china.conf | sed 's/=/ /g' >> ./templates/smartdns/smartdns.conf.j2
+rm -rf ./files/smartdns/china-list.conf
+sed 's/114.114.114.114/china/g' ./dnsmasq-china-list/*.smartdns.conf >> ./templates/smartdns/china-list.conf
+grep -P '^bogus-nxdomain=.+$' dnsmasq-china-list/bogus-nxdomain.china.conf | sed 's/=/ /g' >> ./templates/smartdns/china-list.conf

tasks/main.yml

@@ -24,6 +24,11 @@
     src: smartdns/smartdns.conf.j2
     dest: '{{utility_root}}/smartdns/smartdns.conf'
   notify: restart_smartdns
+- name: china-list
+  copy:
+    src: smartdns/china-list.conf
+    dest: '{{utility_root}}/smartdns/china-list.conf'
+  notify: restart_smartdns
 - name: sni
   synchronize:
     src: ./sni/

templates/docker-compose.yml.j2

@@ -19,7 +19,8 @@ services:
 {% endif %}
     command: -f -x -c /etc/smartdns/smartdns.conf
     volumes:
-      - ./smartdns/smartdns.conf:/etc/smartdns/smartdns.conf:ro
+      - ./smartdns:/etc/smartdns:ro
+      - {{smartdns_cache_path}}:/tmp/smartdns-cache
 
   kms:
     restart: always

templates/smartdns/header.conf.j2 → templates/smartdns/smartdns.conf.j2

+server-name mycard-smartdns
+
 bind-tcp [::]:53
 bind [::]:53
 
 tcp-idle-time 3
 cache-size 4096
+cache-persist yes
+cache-file /tmp/smartdns-cache/cache
 prefetch-domain yes
 
 serve-expired yes
@@ -37,4 +41,5 @@ server {{dns}} -group china -exclude-default-group
 nameserver /{{domain}}/china
 {% endfor %}
 
-# dnsmasq-china-list below
+# china list
+conf-file /etc/smartdns/china-list.conf