diff --git a/config-clash/pontifex/pontifex.yaml b/config-clash/pontifex/pontifex.yaml index 6ad9c60..d015be3 100644 --- a/config-clash/pontifex/pontifex.yaml +++ b/config-clash/pontifex/pontifex.yaml @@ -376,34 +376,33 @@ dns: exclude-filter: "(?i)vless" exclude-type: "Vmess|Vless" - name-normalizer: &name_normalizer - override: - additional-prefix: "" - additional-suffix: "‒𝓿" - proxy-name: - - pattern: '(?i)\bgemini\b' - target: 'USA #gemini' - - pattern: '(?i)\bSS\b|\bshadowsocks\b' - target: '#ssock' - - pattern: '(?i)\bgrpc\b' - target: '#grpct' - - pattern: '(?i)\bvless\b' - target: '#vless' - - pattern: '(?i)\bxhttp\b' - target: '#xhttp' - - pattern: '(?i)\b8443\b' - target: '#p8443' - - pattern: '(?i)\bP2P-Torrents\b|\bTorrent βœ…\b' - target: 'βœ… TORRENT' - - pattern: '(?i)\bviaRussia\b' - target: 'πŸ•³οΈ RU' - - pattern: '(?i)\bnoP2P\b' - target: '❌ TORRENT' + # name-normalizer: &name_normalizer + # override: + # - pattern: '(?i)\bgemini\b' + # target: 'USA #gemini' + # - pattern: '(?i)\bSS\b|\bshadowsocks\b' + # target: '#ssock' + # - pattern: '(?i)\bgrpc\b' + # target: '#grpct' + # - pattern: '(?i)\bvless\b' + # target: '#vless' + # - pattern: '(?i)\bxhttp\b' + # target: '#xhttp' + # - pattern: '(?i)\b8443\b' + # target: '#p8443' + # - pattern: '(?i)P2P|Torrents|torrent' + # target: 'βœ…TRNT' + # - pattern: '(?i)noP2P' + # target: '❌TRNT' + # - pattern: '(?i)⚫ LTE.*?' + # target: '🚫 DO NOT USE' - - pattern: '(?i) |βœ…|-|\||\[|\]|⚑️|10 gbit|ai studio|fast|low ping|roblox|πŸ“Š\d+(MB|GB)/\d+(MB|GB)' - target: '' - - pattern: '(?i)unitedstates|usa|сша' - target: 'USA' + # - pattern: '(?i) |βœ…|-|\||\[|\]|⚑️|10 gbit|ai studio|fast|low ping|roblox|πŸ“Š\d+(MB|GB)/\d+(MB|GB)' + # target: '' + # - pattern: '(?i)viaRussia' + # target: 'πŸ•³οΈ RU' + # - pattern: '(?i)unitedstates|usa|сша' + # target: 'USA' # # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” route sets β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # set-small: &set_small proxies: @@ -565,7 +564,7 @@ proxy-providers: override: additional-prefix: "" additional-suffix: "‒𝓭" - <<: [*health_check_for_providers, *proxy_extrnl, *name_normalizer] + <<: [*health_check_for_providers, *proxy_extrnl] 🎭 vezdehod: url: "https://sub-001.dns-on-fire.net/api/sub/Jfo_eg3X0NchfJ3_" @@ -573,7 +572,7 @@ proxy-providers: override: additional-prefix: "" additional-suffix: "‒𝓿" - <<: [*health_check_for_providers, *proxy_extrnl, *name_normalizer] + <<: [*health_check_for_providers, *proxy_extrnl] 🎭 xfizz: url: "https://xfizz.cc/sublink/XzU0rRmBeOZtIPprW46f2ieNFcF8PJw9?name=1Y:2213" @@ -581,7 +580,7 @@ proxy-providers: override: additional-prefix: "" additional-suffix: "‒𝓯" - <<: [*health_check_for_providers, *proxy_extrnl, *name_normalizer] + <<: [*health_check_for_providers, *proxy_extrnl] 🎭 uncd: url: "https://subs.un1c4d3.ru:52478/sub/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJQTF9WTFNTX0FMTDIxMCIsImFjY2VzcyI6InN1YnNjcmlwdGlvbiIsImlhdCI6MTczNzgwMDQwOH0.mPr4BSMMpo1mrlZPvB34IRGcn2mHOZetHXaZyebirT4" @@ -589,7 +588,7 @@ proxy-providers: override: additional-prefix: "" additional-suffix: "‒𝓾" - <<: [*health_check_for_providers, *proxy_extrnl, *name_normalizer] + <<: [*health_check_for_providers, *proxy_extrnl] 🎩 amnezia: url: "https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/proxy-provider/scarus/amnezia.yaml" diff --git a/config-clash/solar/warpgate-05.yaml b/config-clash/solar/warpgate-05.yaml index 2ead544..8d36d81 100644 --- a/config-clash/solar/warpgate-05.yaml +++ b/config-clash/solar/warpgate-05.yaml @@ -19,16 +19,16 @@ bind-address: "*" external-controller: 0.0.0.0:9090 external-controller-tls: 0.0.0.0:9443 secret: '314159271828' -external-ui: "/usr/share/openclash/ui" +# external-ui: "/usr/share/openclash/ui" # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” GENERAL β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” mode: rule ipv6: false unified-delay: true log-level: info -disable-keep-alive: true -# keep-alive-interval: 15 -# keep-alive-idle: 15 +disable-keep-alive: false +keep-alive-interval: 15 +keep-alive-idle: 600 find-process-mode: "off" # Options: always, strict, off # global-client-fingerprint: random # Options: chrome, firefox, safari, iOS, android, edge, 360, qq, random # tcp-concurrent: true # Enable TCP concurrent connections, which will use all IP addresses resolved by DNS for connections, using the first successful connection. @@ -61,7 +61,7 @@ hosts: 'ruler.shamanlanding.org': '192.168.10.4' 'scriptorium.shamanlanding.org': '192.168.10.4' 'tessera.shamanlanding.org': '192.168.10.4' - 'webway.shamanlanding.org': '192.168.10.4' +# 'webway.shamanlanding.org': '192.168.10.4' 'wishmaster.shamanlanding.org': '192.168.10.4' 'zashboard.shamanlanding.org': '192.168.10.4' @@ -187,12 +187,12 @@ dns: # nameserver-policy: # '+.shamanlanding.org': '192.168.10.4' # direct-nameserver-follow-policy: true - # fallback: + 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 + - 1.1.1.1 + - 1.0.0.1 # - 8.8.8.8 # - 8.8.4.4 # - 9.9.9.9 @@ -368,11 +368,41 @@ dns: exclude-filter: "(?i)nop2p" filter-udp: &filter_udp - filter: "(?i)wg|wireguard" - exclude-filter: "" - filter-cun: &filter_cun - filter: "(?i)SS|8443" + filter: "(?i)wg|wireguard|ss" exclude-filter: "(?i)vless" + exclude-type: "Vmess|Vless" + filter-cun: &filter_cun + filter: "(?i)ss|8443" + exclude-filter: "(?i)vless" + exclude-type: "Vmess|Vless" + + # name-normalizer: &name_normalizer + # override: + # - pattern: '(?i)\bgemini\b' + # target: 'USA #gemini' + # - pattern: '(?i)\bSS\b|\bshadowsocks\b' + # target: '#ssock' + # - pattern: '(?i)\bgrpc\b' + # target: '#grpct' + # - pattern: '(?i)\bvless\b' + # target: '#vless' + # - pattern: '(?i)\bxhttp\b' + # target: '#xhttp' + # - pattern: '(?i)\b8443\b' + # target: '#p8443' + # - pattern: '(?i)P2P|Torrents|torrent' + # target: 'βœ…TRNT' + # - pattern: '(?i)noP2P' + # target: '❌TRNT' + # - pattern: '(?i)⚫ LTE.*?' + # target: '🚫 DO NOT USE' + + # - pattern: '(?i) |βœ…|-|\||\[|\]|⚑️|10 gbit|ai studio|fast|low ping|roblox|πŸ“Š\d+(MB|GB)/\d+(MB|GB)' + # target: '' + # - pattern: '(?i)viaRussia' + # target: 'πŸ•³οΈ RU' + # - pattern: '(?i)unitedstates|usa|сша' + # target: 'USA' # # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” route sets β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # set-small: &set_small proxies: @@ -852,7 +882,7 @@ proxy-groups: - PASS - REJECT-DROP - β–£ UDP Ready - <<: [*group_selector, *set_basic, *health_check] + <<: [*group_selector, *health_check] - name: Akamai <<: [*set_basic, *group_selector_hidden, *health_check] @@ -1395,7 +1425,13 @@ rules: - GEOSITE,PRIVATE,DIRECT - GEOIP,PRIVATE,DIRECT,no-resolve +# β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” fool-proof russian first β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” +- OR,((RULE-SET,πŸ“¦ RU Services Manual),(GEOIP,RU),(GEOSITE,category-ru)),RU Services + # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” source ip match β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” +- RULE-SET,πŸ› Testzone A,Testzone πŸ…° +- RULE-SET,πŸ› Testzone B,Testzone πŸ…± + - RULE-SET,πŸ›œ VLAN10,VLAN10 - RULE-SET,πŸ›œ VLAN20,VLAN10 - RULE-SET,πŸ›œ VLAN30,VLAN20 @@ -1406,8 +1442,6 @@ rules: - RULE-SET,πŸ›œ Webway Unprivileged,Webway Unprivileged Clients - RULE-SET,πŸ›œ Smart TV Clients,Smart TV Clients - RULE-SET,πŸ›œ Torrent Clients,Torrent Clients -- RULE-SET,πŸ› Testzone A,Testzone πŸ…° -- RULE-SET,πŸ› Testzone B,Testzone πŸ…± # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” quick ip check β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” - DOMAIN-SUFFIX,upaiyun.com,Route Alpha @@ -1418,9 +1452,9 @@ rules: - DOMAIN-SUFFIX,whatismyipaddress.com,Personal 2️⃣ # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” udp catcher β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” -- AND((NETWORK,udp),(RULE-SET,Telegram)),UDP Catcher -- AND((NETWORK,udp),(RULE-SET,Discord)),UDP Catcher -- AND((NETWORK,udp),(RULE-SET,WhatsApp)),UDP Catcher +- AND,((NETWORK,udp),(RULE-SET,Telegram)),UDP Catcher +- AND,((NETWORK,udp),(RULE-SET,Discord)),UDP Catcher +- AND,((NETWORK,udp),(RULE-SET,WhatsApp)),UDP Catcher # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” by private lists β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” - RULE-SET,πŸ“ƒ Persistent Proxy,Persistent Proxy @@ -1509,10 +1543,8 @@ rules: - RULE-SET,🚫 Adblock List GL,Adblock πŸ—ΊοΈ # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” by service group (manual country) β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” # β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€”β€” -- OR,((RULE-SET,πŸ“¦ RU Services Manual),(GEOIP,RU),(GEOSITE,category-ru)),RU Services -- OR,((RULE-SET,πŸ“¦ US Services Manual),(GEOIP,US),US Services -- OR,((RULE-SET,πŸ“¦ CN Services Manual),(GEOIP,US),CN Services -- OR,((RULE-SET,πŸ“¦ EU Services Manual),(GEOIP,UK),EU Services +- OR,((RULE-SET,πŸ“¦ US Services Manual),(GEOIP,US)),US Services +- OR,((RULE-SET,πŸ“¦ CN Services Manual),(GEOIP,US)),CN Services - MATCH,FALLBACK diff --git a/rule-provider/consolidated-lists-private/vlan40.yaml b/rule-provider/consolidated-lists-private/vlan40.yaml new file mode 100644 index 0000000..18a868c --- /dev/null +++ b/rule-provider/consolidated-lists-private/vlan40.yaml @@ -0,0 +1,10 @@ +payload: + - SRC-IP-CIDR,192.168.14.1/24 + - SRC-IP-CIDR,192.168.24.1/24 + - SRC-IP-CIDR,192.168.34.1/24 + - SRC-IP-CIDR,192.168.44.5/24 + - SRC-IP-CIDR,192.168.54.5/24 + - SRC-IP-CIDR,192.168.64.5/24 + - SRC-IP-CIDR,192.168.74.5/24 + - SRC-IP-CIDR,192.168.84.5/24 + - SRC-IP-CIDR,192.168.94.5/24 \ No newline at end of file