Updated proxy providers

config/solar-p.yaml

@@ -12,11 +12,9 @@ authentication:
 # —————————————————————————————— external controller —————————————————————————————
 external-controller: 0.0.0.0:9090
 secret: '314159271828'
-# external-ui: "/usr/share/openclash/ui"
+external-ui: "/etc/clash/ui/"
 # authentication:
 #   - dts-solar-clash-p:314159271828
-mode: rule
-log-level: info
 
 # ———————————————————————————————————— general ———————————————————————————————————
 mode: rule
@@ -164,13 +162,6 @@ tun:
   
 # ————————————————————————————————— proxies list —————————————————————————————————
 proxies:
-  # ————————————————————— direct wan routes ————————————————————
-  - name: "WAN A [МТС]"
-    type: direct
-    udp: true
-    ip-version: ipv4
-    interface-name: eth0
-  
   # ——————————————————— private vpn services ———————————————————
   - name: vless-serbia
     type: vless
@@ -224,7 +215,7 @@ proxy-providers:
   #https://xfizz.cc/sublink/XzU0rRmBeOZtIPprW46f2ieNFcF8PJw9?name=1Y:2213
   xfizz:
     type: http
-    url: "https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/CLASH%20RULES/proxy-providers/gofinn-test-account-full"
+    url: "https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/clash-rules/proxy-provider/fizz-vpn.txt"
     interval: 3600
     proxy: DIRECT
     path: "./proxy_provider/fizz-vpn.txt"
@@ -238,7 +229,7 @@ proxy-providers:
   #https://arza.top/sub/dGZjNHVlLDE3MzIzMDQ2MTYowA-efEYOh
   arza-1:
     type: http
-    url: "https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/CLASH%20RULES/proxy-providers/arza"
+    url: "https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/clash-rules/proxy-provider/arza.txt"
     interval: 3600
     proxy: DIRECT
     path: "./proxy_provider/arza.txt"
@@ -252,7 +243,7 @@ proxy-providers:
   #https://subs.un1c4d3.ru:52478/sub/eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJQTF9WTFNTX0FMTDIxMCIsImFjY2VzcyI6InN1YnNjcmlwdGlvbiIsImlhdCI6MTczNzgwMDQwOH0.mPr4BSMMpo1mrlZPvB34IRGcn2mHOZetHXaZyebirT4
   Un1c4d3:
     type: http
-    url: "https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/CLASH%20RULES/proxy-providers/Un1c4d3"
+    url: "https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/clash-rules/proxy-provider/Un1c4d3.txt"
     interval: 3600
     proxy: DIRECT
     path: "./proxy_provider/Un1c4d3.txt"
@@ -275,117 +266,97 @@ proxy-groups:
   
   # —————————————— load balancers for personal vpn —————————————
   - name: ⚖️ Personal VPN
-    <<: *p_vpn_list_balancer
+    <<: [*p_vpn_list_balancer, *health_check_for_load_balancers]
-    <<: *health_check_for_load_balancers
 
   # ———————————— load balancers for non-personal vpn ———————————
   - name: ⚖️ Russian
-    <<: *np_vpn_list_balancer
     disable-udp: false
     filter: "(?i)Russia"
-    <<: *health_check_for_load_balancers
+    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
   
   - name: ⚖️ Europe
-    <<: *np_vpn_list_balancer
     disable-udp: false
     filter: "(?i)NL|Finland|Estonia|France|Germany|Sweden|Ireland"
-    <<: *health_check_for_load_balancers
+    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
   
   - name: ⚖️ USA
-    <<: *np_vpn_list_balancer
     disable-udp: false
     filter: "(?i)USA|Canada"
-    <<: *health_check_for_load_balancers
+    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
   
   - name: ⚖️ Asia
-    <<: *np_vpn_list_balancer
     disable-udp: false
     filter: "(?i)Hong Kong|China|Malaysia|Philippines|Japan|Singapore"
-    <<: *health_check_for_load_balancers
+    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
   
   - name: ⚖️ High Bandwidth
-    <<: *np_vpn_list_balancer
     disable-udp: false
     filter: "(?i)10 Gbit"
-    <<: *health_check_for_load_balancers
+    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
   
   - name: ⚖️ Fast Servers
-    <<: *np_vpn_list_balancer
     disable-udp: false
     filter: "(?i)Low Ping"
-    <<: *health_check_for_load_balancers
+    <<: [*np_vpn_list_balancer, *health_check_for_load_balancers]
-
+  
   # ————————————— global selectors for personal vpn ————————————
   - name: 🔢 Personal VPN
-    <<: *p_vpn_list_selector
     disable-udp: false
-    <<: *health_check_for_selectors
+    <<: [*p_vpn_list_selector, *health_check_for_selectors]
   
   # ——————————— global selectors for non-personal vpn ——————————
   - name: 🔢 Russian
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)Russia"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
 
   - name: 🔢 Europe
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)NL|Finland|Estonia|France|Germany|Sweden|Ireland|Moldova"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
-  
+
   - name: 🔢 USA
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)USA|Canada"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
-  
+
   - name: 🔢 Asia
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)Hong Kong|China|Malaysia|Philippines|Japan|Singapore"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
-  
+
   - name: 🔢 Kazakhstan
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)Kazakhstan|KZ"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
-  
+
   - name: 🔢 All non-personal
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: ""
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
-  
+
   - name: 🔢 Gaming
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)game"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
 
   - name: 🔢 Torrent Compliant
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)torrent"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
-  
+
   - name: 🔢 TOR Compliant
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)TOR✅"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
-  
+
   - name: 🔢 Fast Servers
-    <<: *np_vpn_list_selector
     disable-udp: false
     filter: "(?i)10 Gbit|10Gbit"
-    <<: *health_check_for_selectors
+    <<: [*np_vpn_list_selector, *health_check_for_selectors]
-  
+
-  # —————————— selectors for unprivileged webway rules —————————
+  # ——————— selectors for local rules ——————
-  
+  - name: YouTube
-  # ——————— selectors for local & privileged webway rules ——————
-  - name: YouTube [LAN]
     type: select
     proxies:
       - 🔢 Russian
@@ -472,75 +443,75 @@ rule-providers:
   
   # ———————————————————————— gitea lists ———————————————————————
   AI Stuff (Western):
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/2005-lpu-ai-stuff-western.yaml       # AI Stuff
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/ai-stuff-western.yaml       # AI Stuff
-    path: "./rule_provider/2005-lpu-ai-stuff-western.yaml"                                                                                 
+    path: "./rule_provider/ai-stuff-western.yaml"                                                                                 
     <<: *default_rule_provider_config
 
   Discord:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/2005-lpu-ai-stuff-western.yaml       # AI Stuff
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/discord.yaml       # AI Stuff
     path: "./rule_provider/discord.yaml"                                                                                 
     <<: *default_rule_provider_config
   
   Notion:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/2000-lpu-notion.yaml                 # Notion
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/notion.yaml                 # Notion
-    path: "./rule_provider/2000-lpu-notion.yaml"
+    path: "./rule_provider/notion.yaml"
     <<: *default_rule_provider_config
   
   Youtube:
-    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/1003-lpx-youtube.yaml                # Youtube
+    url: https://gitea.shamanlanding.org/DaTekShaman/clash-rules/raw/branch/main/rule-provider/youtube.yaml                # Youtube
-    path: "./rule_provider/1003-lpx-youtube.yaml"
+    path: "./rule_provider/youtube.yaml"
     <<: *default_rule_provider_config
   
   Testzone A:
-    url: https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/CLASH%20RULES/rule-providers/ip-test.yaml
+    url: https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/clash-rules/rule-providers/ip-test.yaml
-    path: "./rule_provider/0000-lpx-testzone-a.yaml"
+    path: "./rule_provider/testzone-a.yaml"
     <<: *default_rule_provider_config
   
   USA Services:
-    url: https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/CLASH%20RULES/rule-providers/usa-services.yaml
+    url: https://gitea.shamanlanding.org/DaTekShaman/arcadia/raw/branch/main/clash-rules/rule-providers/usa-services.yaml
     path: "./rule_provider/usa-services.yaml"
     <<: *default_rule_provider_config
   
     # —————————————————————— adaptaion lists —————————————————————
   General Direct Domain List:
     url: http://purpose.shamanlanding.org:9999/direct-domain.yaml
-    path: "./ruleset/0001-lpu-direct-domain.yaml"
+    path: "./ruleset/direct-domain.yaml"
     <<: *default_rule_provider_config
   
   General Direct IP List:
     url: http://purpose.shamanlanding.org:9999/direct-ip.yaml
-    path: "./ruleset/0001-lpu-direct-ip.yaml"
+    path: "./ruleset/direct-ip.yaml"
     <<: *default_rule_provider_config
  
   General Proxy Domain List:
     url: http://purpose.shamanlanding.org:9999/proxy-domain.yaml
-    path: "./ruleset/0002-lpx-adaptation-domain-proxy.yaml"
+    path: "./ruleset/adaptation-domain-proxy.yaml"
     <<: *default_rule_provider_config
   
   General Proxy IP List:
     url: http://purpose.shamanlanding.org:9999/proxy-ip.yaml
-    path: "./ruleset/0002-lpx-adaptation-ip-proxy.yaml"
+    path: "./ruleset/adaptation-ip-proxy.yaml"
     <<: *default_rule_provider_config
   
   # ————————————————— antifilter community list ————————————————
   Antifilter IP List:
     url: http://purpose.shamanlanding.org:9999/antifilter-ip.yaml
-    path: "./ruleset/9998-lpx-antifilter-ip-proxy.yaml"
+    path: "./ruleset/antifilter-ip-proxy.yaml"
     <<: *default_rule_provider_config
   Antifilter Community IP List:
     url: http://purpose.shamanlanding.org:9999/antifilter-community-ip.yaml
-    path: "./ruleset/9999-lpx-antifilter-community-ip-proxy.yaml"
+    path: "./ruleset/antifilter-community-ip-proxy.yaml"
     <<: *default_rule_provider_config
   Antifilter Community Domain List:
     url: http://purpose.shamanlanding.org:9999/antifilter-community-domain.yaml
-    path: "./ruleset/9998-lpx-antifilter-domain-proxy.yaml"
+    path: "./ruleset/antifilter-domain-proxy.yaml"
     <<: *default_rule_provider_config
 
 # ————————————————————————————————————— rules ————————————————————————————————————
 rules:
 
 # —————————————————————— by application ——————————————————————
-- RULE-SET,Youtube,YouTube [LAN]
+- RULE-SET,Youtube,YouTube
 - RULE-SET,Notion,Notion
 - RULE-SET,Testzone A,Testzone A
 - RULE-SET,AI Stuff (Western),Testzone A
@@ -548,12 +519,12 @@ rules:
 - RULE-SET,USA Services,USA Services
 
 # —————————————————————— adaptaion lists —————————————————————
-- RULE-SET,General Direct Domain List,🖥️ LAN Clients
+- RULE-SET,General Direct Domain List,DIRECT
-- RULE-SET,General Direct IP List,🖥️ LAN Clients
+- RULE-SET,General Direct IP List,DIRECT
 - RULE-SET,General Proxy Domain List,Adaptaion
 - RULE-SET,General Proxy IP List,Adaptaion
 - RULE-SET,Antifilter IP List,Antifilter
 - RULE-SET,Antifilter Community IP List,Antifilter
 - RULE-SET,Antifilter Community Domain List,Antifilter
 
-- MATCH,🖥️ LAN Clients
+- MATCH,DIRECT