update scripts

Author: taamarin

scripts/clash.config

@@ -11,7 +11,7 @@ mode="blacklist"
 info_core="true"
 nat_kernel="false"
 use_premium=false
-use_config=false
+use_config="false"
 
 # CGROUP untuk membatasi penggunaan memori,
 Cgroup_memory="false"
@@ -82,8 +82,8 @@ Clash_redir_port=$(grep "redir-port" ${Clash_dns} | ${busybox_path} awk -F ':' '
 Clash_mixed_port=$(grep "mixed-port" ${Clash_dns} | ${busybox_path} awk -F ':' '{print $2}')
 Clash_dns_port=$(grep "listen" ${Clash_dns} | ${busybox_path} awk -F ':' '{print $3}')
 Clash_enhanced_mode=$(grep "enhanced-mode" ${Clash_dns} | ${busybox_path} awk -F ': ' '{print $2}')
-Clash_tun_status=$(${busybox_path} awk -F ': ' '/^tun: *$/{getline; print $2}' ${Clash_dns})
 tun_device=$(${busybox_path} awk -F ': ' '/ +device: /{print $2}' ${Clash_dns})
+auto_iptables=$(${busybox_path} awk -F ': ' '/^iptables: *$/{getline; print $2}' ${Clash_dns})
 interface_name=$(ip r show | grep "src" | cut -d " " -f 3,12)
 
 # internet ipv4

scripts/clash.service

@@ -4,11 +4,6 @@ scripts=`realpath $0`
 scripts_dir=`dirname ${scripts}`
 . ${scripts_dir}/clash.config
 
-echo -n "" > ${CFM_logs_file}
-${Clash_bin_path} -v >> ${CFM_logs_file}
-echo "${date_day}" >> ${CFM_logs_file}
-echo "Clash for Magisk v1.9.5" >> ${CFM_logs_file}
-
 start_clash() {
     if [ "${ipv6}" = "false" ] ; then
         echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6
@@ -22,6 +17,11 @@ start_clash() {
         echo 0 > /proc/sys/net/ipv6/conf/lo/disable_ipv6
     fi
 
+    echo -n "" > ${CFM_logs_file}
+    ${Clash_bin_path} -v >> ${CFM_logs_file}
+    echo "${date_day}" >> ${CFM_logs_file}
+    echo "Clash for Magisk v1.9.5" >> ${CFM_logs_file}
+
     if [ "${use_premium}" == "true" ]; then
         echo "info msg= Mengunakan Clash Premium" >> ${CFM_logs_file}
     else

scripts/clash.tproxy

@@ -33,11 +33,19 @@ tun_notif_on() {
     echo "info msg= connected" >> ${CFM_logs_file}
 }
 tproxy_notif_off() {
-    echo "info msg= Iptables Tproxy dihapus" >> ${CFM_logs_file}
+    if [ "${auto_iptables}" == "false" ]; then
+        echo "info msg= Iptables Tproxy dihapus" >> ${CFM_logs_file}
+    else
+        echo "info msg= auto Iptables Tproxy dihapus" >> ${CFM_logs_file}
+    fi
     echo "info msg= discontinued" >> ${CFM_logs_file}
 }
 tproxy_notif_on() {
-    echo "info msg= Iptables Tproxy diterapkan" >> ${CFM_logs_file}
+    if [ "${auto_iptables}" == "false" ]; then
+        echo "info msg= Iptables Tproxy diterapkan" >> ${CFM_logs_file}
+    else
+        echo "info msg= auto Iptables Tproxy diterapkan" >> ${CFM_logs_file}
+    fi
     echo "info msg= connected" >> ${CFM_logs_file}
 }
 
@@ -377,8 +385,12 @@ while getopts ":sk" signal ; do
     case ${signal} in
         s)
            if [ "${Clash_tun_status}" == "false" ]; then
-               start_tproxy && tproxy_notif_on
-               rm_logs
+               if [ "${auto_iptables}" == "false" ]; then
+                   start_tproxy && tproxy_notif_on
+                   rm_logs
+               else
+                   tproxy_notif_on
+               fi
            elif [ "${Clash_tun_status}" == "true" ]; then
                if [ "${Clash_auto_route}" == "true" ]; then
                    ${iptables_wait} -I FORWARD -o ${tun_device} -j ACCEPT
@@ -399,7 +411,11 @@ while getopts ":sk" signal ; do
             ;;
         k)
             if [ "${Clash_tun_status}" == "false" ]; then
-                stop_tproxy && tproxy_notif_off
+                if [ "${auto_iptables}" == "false" ]; then
+                    stop_tproxy && tproxy_notif_off
+                else
+                    tproxy_notif_off
+                fi
             elif [ "${Clash_tun_status}" == "true" ]; then
                 if [ "${Clash_auto_route}" == "true" ]; then
                     ${iptables_wait} -D FORWARD -o ${tun_device} -j ACCEPT

scripts/template

@@ -1,19 +1,28 @@
 tproxy-port: 9898
 bind-address: "*"
 mode: rule
+ipv6: true
 allow-lan: true
 log-level: silent
-external-controller: 0.0.0.0:9090 
+external-controller: 127.0.0.1:9090
 external-ui: yacd-gh-pages
 unified-delay: true
 geodata-mode: false
 tcp-concurrent: false
 secret: ""
-ipv6: false
 udp: true
+tun:
+  enable: false
+  device: utun
+  stack: system
+  dns-hijack:
+    - 'any:53'
+    - 'tcp://any:53'
+  auto-route: true
+  auto-detect-interface: true
 dns:
   enable: true
-  ipv6: false
+  ipv6: true
   default-nameserver:
     - 1.1.1.1
     - 8.8.8.8
@@ -22,34 +31,40 @@ dns:
   fake-ip-range: 198.18.0.1/15
   use-hosts: true
   fake-ip-filter:
-    - 'connect.rom.miui.com'
+    - '*.lan'
   nameserver:
     - 'tls://1dot1dot1dot1.cloudflare-dns.com'
     - 'https://dns.cloudflare.com/dns-query'
-#  fallback:
-#    - 'tls://8.8.4.4:853'
+  fallback:
+    - 'https://1.0.0.1/dns-query#GLOBAL'  
+    - 'tls://8.8.4.4:853#GLOBAL'
   fallback-filter:
     geoip: false
-    geoip-code: CN
+    geoip-code: ID
+    geosite:
+    #  - gfw
+    domain:
+    #  - +.example.com
+    ipcidr:
+    #  - 0.0.0.0/32
 sniffer:
   enable: false
   force: true
   Reverse:
-    - +.google.com
+    - '+.google.com'
   force-domain:
-    - "google.com"
+    - '+'
+    - 'google.com'
   skip-sni:
-    - www.baidu.com
+    - '+.apple.com'
   sniffing:
     - tls
-tun:
-  enable: false
-  device: utun
-  stack: system
-  dns-hijack:
-    - 'any:53'
-  auto-route: false
-  auto-detect-interface: false
+    - http
+  port-whitelist:
+    - 443
+    - 8000-9000
 iptables:
   enable: false
-  inbound-interface: ""
+  inbound-interface: "lo"
+  bypass:
+interface-name: ""