remove tld thing and clean most confs

.gitignore

 ansible/*.retry
 *pycache*
 gfwlist-ipset.conf
+/dnsmasq.d/tld.conf

.gitlab-ci.yml

@@ -20,13 +20,14 @@ deploy:
     - linux
   script:
     - apt update && apt -y install openssh-client coreutils rsync
-    - pip install -U ansible==2.9 jinja2==3.0 -i https://mirrors.aliyun.com/pypi/simple/
+    - pip install -U ansible==2.9.6 jinja2==3.0 -i https://mirrors.aliyun.com/pypi/simple/
     - ansible --version
     - mkdir ~/.ssh
     - chmod 700 ~/.ssh
     - echo $SSH_KEY | base64 --decode > ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/*
-    - curl -sL https://cokebar.github.io/gfwlist2dnsmasq/dnsmasq_gfwlist_ipset.conf |  grep -P '^ipset=' > gfwlist-ipset.conf
+    #- curl -sL https://cokebar.github.io/gfwlist2dnsmasq/dnsmasq_gfwlist_ipset.conf |  grep -P '^ipset=' > gfwlist-ipset.conf
+    - ./tld.sh
     - cd ansible
     - chmod 700 .
     - ansible-playbook update.yaml || true

dnsmasq.d/anillc.conf

-# clean

dnsmasq.d/ayane.conf

-# clean
-# clean

dnsmasq.d/ayumi.conf

-# clean

dnsmasq.d/cain.conf

-# clean

dnsmasq.d/cloud.conf

-# clean

dnsmasq.d/common.conf

-# clean

dnsmasq.d/fengyun.conf

-# clean

dnsmasq.d/gzzchh.conf

-# clean

dnsmasq.d/koishi.conf

-# clean

dnsmasq.d/marcia.conf

-# clean

dnsmasq.d/myacg.conf

-# clean

dnsmasq.d/mycard.conf

-# clean
-# clean

dnsmasq.d/pter.conf

-# clean

dnsmasq.d/tld.conf

-server=/koishi.pro/10.198.7.58
-server=/eplus.group/10.198.7.58
-server=/yuzurisa.com/10.198.7.58
-server=/198.10.in-addr.arpa/10.198.7.58
-server=/backbone.lv5.ac/10.198.7.58
-server=/my-card.in/10.198.7.58
-server=/momobako.com/10.198.7.58
-server=/hlsjgw.com/10.198.7.58
-server=/mycard.moe/10.198.7.58
-server=/e-plus.group/10.198.7.58
-server=/ygopro.cn/10.198.7.58
-server=/moecube.com/10.198.7.58
-server=/moestart.com/10.198.7.58
-server=/blockfightroushan.com/10.198.7.58
-server=/risayuzuki.com/10.198.7.58
-server=/lv5.ac/10.198.7.58
-server=/ygobbs.com/10.198.7.58
-server=/newwise.com/10.198.7.58
-server=/reverse1999.wiki/10.198.7.58
-server=/wenaiwu.net/10.198.7.58
-server=/myacg.cc/10.198.7.58
-server=/touhou.cc/10.198.7.58

dnsmasq.d/trollcraft.conf

-# clean

dnsmasq.d/yuyuko.conf

-# clean

dnsmasq.d/yuzurisa.conf

-# clean

tld.sh

+#!/bin/bash
+nsAddress=10.198.7.58
+
+ssh -T root@$nsAddress docker compose --project-directory /root/dns exec powerdns pdnsutil list-all-zones | \
+  sed "s/^/server=\//g;s/\$/\/$nsAddress/g" > ./dnsmasq.d/tld.conf