fix

files/dnsmasq/smartdns.conf.j2

@@ -27,35 +27,35 @@ dualstack-ip-selection yes
 {% if smartdns.udp_dns is defined and smartdns.udp_dns %}
 # UDP DNSes
 {% for dns in smartdns.udp_dns %}
-server {{dns}} -group ovsersea
+server {{dns}} -group oversea
 {% endfor %}
 {% endif %}
 
 {% if smartdns.tcp_dns is defined and smartdns.tcp_dns %}
 # TCP DNSes
 {% for dns in smartdns.tcp_dns %}
-server-tcp {{dns}} -group ovsersea
+server-tcp {{dns}} -group oversea
 {% endfor %}
 {% endif %}
 
 {% if smartdns.tls_dns is defined and smartdns.tls_dns %}
 # TLS DNSes
 {% for dns in smartdns.tls_dns %}
-server-tls {{dns}} -group ovsersea
+server-tls {{dns}} -group oversea
 {% endfor %}
 {% endif %}
 
 {% if smartdns.https_dns is defined and smartdns.https_dns %}
 # HTTPS DNSes
 {% for dns in smartdns.https_dns %}
-server-https https://{{dns}}/dns-query -group ovsersea
+server-https https://{{dns}}/dns-query -group oversea
 {% endfor %}
 {% endif %}
 
 {% if smartdns.trusted_dns is defined and smartdns.trusted_dns %}
 # Trusted DNSes
 {% for dns in smartdns.trusted_dns %}
-server {{dns}} -group ovsersea
+server {{dns}} -group oversea
 {% endfor %}
 {% endif %}
 

prepare.sh

@@ -5,7 +5,7 @@ download_repo() {
   REPO_URL=$2
   echo "Downloading $REPO_DIR"
   if [ -d "$REPO_DIR" ]; then
-    (cd "$REPO_DIR" && git pull --depth 1)
+    (cd "$REPO_DIR" && git fetch origin && git reset --hard FETCH_HEAD)
   else
     git clone --depth 1 "$REPO_URL" "$REPO_DIR"
   fi