diff --git a/config-clash/pontifex/pontifex.yaml b/config-clash/pontifex/pontifex.yaml index 7779aa8..3d0507d 100644 --- a/config-clash/pontifex/pontifex.yaml +++ b/config-clash/pontifex/pontifex.yaml @@ -146,10 +146,10 @@ dns: cache-algorithm: arc ipv6: false listen: 0.0.0.0:53 - prefer-h3: true - respect-rules: false + prefer-h3: false + respect-rules: true use-hosts: true - use-system-hosts: true + use-system-hosts: false fake-ip-range: 198.18.0.1/16 fake-ip-filter-mode: blacklist @@ -164,37 +164,42 @@ dns: - '+.ru' - '+.рф' - '+.su' - default-nameserver: - - 1.1.1.1 - - 8.8.8.8 - - 9.9.9.9 - nameserver: - - 192.168.10.7 - proxy-server-nameserver: - - 192.168.10.7 - # direct-nameserver: - # - 192.168.10.4 - # - https://d.adguard-dns.com/dns-query/5ffb7de2 - # nameserver-policy: - # '+.shamanlanding.org': '192.168.10.4' - # direct-nameserver-follow-policy: true - - fallback: - - https://d.adguard-dns.com/dns-query/5ffb7de2 # Fallback DNS @ https://adguard-dns.io/en/dashboard/ - - https://dns.comss.one/dns-query # Fallback DNS Comss.one - - https://cloudflare-dns.com/dns-query # Fallback DNS Cloudfalre + default-nameserver: # Resolving the domain names of DNS servers. - 1.1.1.1 - 1.0.0.1 - 8.8.8.8 - 8.8.4.4 - 9.9.9.9 - - 77.88.8.8 - - 77.88.8.1 - fallback-filter: - geoip: false - # ipcidr: [] - # domain: [] - # geosite: [] + nameserver: # Default domain name resolution server. + - https://d.adguard-dns.com/dns-query/5ffb7de2 + proxy-server-nameserver: # Resolving the domain names of proxy nodes. + - 1.1.1.1 + - 1.0.0.1 + - 8.8.8.8 + - 8.8.4.4 + - 9.9.9.9 + # direct-nameserver: # Domain resolution at the direct exit + # - 192.168.10.4 + # - https://d.adguard-dns.com/dns-query/5ffb7de2 + # nameserver-policy: + # '+.shamanlanding.org': '192.168.10.4' + # direct-nameserver-follow-policy: true + # fallback: + # - https://d.adguard-dns.com/dns-query/5ffb7de2 # Fallback DNS @ https://adguard-dns.io/en/dashboard/ + # - https://dns.comss.one/dns-query # Fallback DNS Comss.one + # - https://cloudflare-dns.com/dns-query # Fallback DNS Cloudfalre + # - 1.1.1.1 + # - 1.0.0.1 + # - 8.8.8.8 + # - 8.8.4.4 + # - 9.9.9.9 + # - 77.88.8.8 + # - 77.88.8.1 + # fallback-filter: + # geoip: false + # ipcidr: [] + # domain: [] + # geosite: [] # ———————————————————————————————————————————————————————— MACRO ———————————————————————————————————————————————————————— # # ———————————————————————————————— direct proxy ————————————————————————————————— # @@ -338,8 +343,8 @@ dns: # # —————————————————————————————————— route sets ————————————————————————————————— # set-small: &set_small proxies: - - DIRECT ROUTE 🦊 - - DIRECT ROUTE 🐻 + - WAN A + - WAN B - WAN BALANCER - PASS - REJECT @@ -351,8 +356,8 @@ dns: set-basic: &set_basic proxies: - - DIRECT ROUTE 🦊 - - DIRECT ROUTE 🐻 + - WAN A + - WAN B - WAN BALANCER - PASS - REJECT @@ -368,8 +373,8 @@ dns: set-extnd: &set_extnd proxies: - - DIRECT ROUTE 🦊 - - DIRECT ROUTE 🐻 + - WAN A + - WAN B - WAN BALANCER - PASS - REJECT @@ -410,14 +415,12 @@ dns: set-srcip: &set_srcip proxies: - - DIRECT ROUTE 🦊 - - DIRECT ROUTE 🐻 + - WAN A + - WAN B - WAN BALANCER - PASS - REJECT - REJECT-DROP - - WAN A [Мегафон] - - WAN B [РосТелеКом] - Personal 1️⃣ - Personal 2️⃣ - Non-personal 1️⃣ @@ -445,10 +448,10 @@ dns: # ————————————————————————————————————————————————————— PROXIES LIST ———————————————————————————————————————————————————— proxies: # # —————————————————————————————— direct wan routes —————————————————————————————— # - - name: "WAN A [Мегафон]" + - name: "WAN A" interface-name: eth2 <<: [*direct_proxy, *health_check_for_providers] - - name: "WAN B [РосТелеКом]" + - name: "WAN B" interface-name: eth1 <<: [*direct_proxy, *health_check_for_providers] # # ——————————————————————————————— private proxies ——————————————————————————————— # @@ -510,17 +513,6 @@ proxy-providers: health-check: <<: *health_check_for_providers - 🎩 hynet: - type: file - interval: 3600 - proxy: ▣ Personal - path: "./proxy_provider/hynet.txt" - exclude-filter: "xhttp" - override: - additional-prefix: "💫 " - additional-suffix: "" - health-check: - <<: *health_check_for_providers # # ———————————————————————————— external vpn services ———————————————————————————— # 🎭 d-vpn: @@ -559,10 +551,22 @@ proxy-providers: url: "https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/proxy-provider/scarus/amnezia.yaml" path: "./proxy_provider/amnezia.txt" override: - additional-prefix: "" - additional-suffix: "•𝓾" + additional-prefix: "🎩 " + additional-suffix: "" <<: [*health_check_for_providers, *gitea_proxy] + 🎩 hynet: + type: file + interval: 3600 + proxy: ▣ Personal + path: "./proxy_provider/hynet.txt" + exclude-filter: "xhttp" + override: + additional-prefix: "🎩 " + additional-suffix: "" + health-check: + <<: *health_check_for_providers + # ————————————————————————————————————————————————————— PROXY GROUPS ———————————————————————————————————————————————————— proxy-groups: # # ——————————————————————————————————— fallback —————————————————————————————————— # @@ -574,8 +578,8 @@ proxy-groups: - DIRECT - REJECT - WAN BALANCER - - WAN A [Мегафон] - - WAN B [РосТелеКом] + - WAN A + - WAN B hidden: true url: 'https://cp.cloudflare.com/generate_204' interval: 300 @@ -585,32 +589,11 @@ proxy-groups: type: load-balance disable-udp: false proxies: - - WAN A [Мегафон] - - WAN B [РосТелеКом] - hidden: true - <<: *health_check_for_providers - - - name: DIRECT ROUTE 🦊 - type: select - disable-udp: false - proxies: - - DIRECT - - WAN A [Мегафон] - - WAN B [РосТелеКом] - - WAN BALANCER + - WAN A + - WAN B hidden: true <<: *health_check_for_providers - - name: DIRECT ROUTE 🐻 - type: select - disable-udp: false - proxies: - - DIRECT - - WAN A [Мегафон] - - WAN B [РосТелеКом] - - WAN BALANCER - hidden: true - <<: *health_check_for_providers # # ————————————————————————————— source ip selectors ————————————————————————————— # - name: VLAN10 @@ -1487,8 +1470,8 @@ rules: # —————————————— force russian geoip to russia —————————————— # ————————————————————————————————————————————————————————— # - GEOIP,EU,EU Services # Split By Country - GEOIP,RU,RU Services -- GEOIP,US,US Services -- GEOIP,CN,CN Services +# - GEOIP,US,US Services +# - GEOIP,CN,CN Services # ———————————————————— force other geoip ———————————————————— # ————————————————————————————————————————————————————————— - MATCH,FALLBACK diff --git a/rule-provider/services/fastly.yaml b/rule-provider/services/fastly.yaml new file mode 100644 index 0000000..86e6f8d --- /dev/null +++ b/rule-provider/services/fastly.yaml @@ -0,0 +1,6 @@ + +##FETCH## https://github.com/blackmatrix7/ios_rule_script/blob/master/rule/Clash/Cloudflare/Cloudflare.yaml +##FETCH## + +payload: + - GEOIP,fastly \ No newline at end of file