From 88092aba5b750328cc53a4629447ae87a0a21654 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sat, 17 Feb 2024 14:58:01 +0800
Subject: [PATCH] fix: dae - github

---
 hosts/idols_aquamarine/README.md  |  4 ++--
 hosts/idols_aquamarine/config.dae | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/hosts/idols_aquamarine/README.md b/hosts/idols_aquamarine/README.md
index 27483d43..aa4d2200 100644
--- a/hosts/idols_aquamarine/README.md
+++ b/hosts/idols_aquamarine/README.md
@@ -10,13 +10,13 @@ NOTE: dae(running on aquamarine) do not provides http/socks5 proxy server, so a
 
 1. `sudo systemctl stop dae`, then try to resolve the domain name again.
    - If it works, the problem is caused by `dae` service.
-   - check dae's log by `sudo journalctl -u dae`
+   - check dae's log by `journalctl -u dae -n 1000`
 1. DNS & DHCP is provided by `dnsmasq` service, check the configuration of `dnsmasq`.
 
 ### DHCP cannot be obtained
 
 1. `ss -tunlp`, check if `dnsmasq` is running and listening on udp port 67.
-1. `journalctl -u dnsmasq` to check the log of `dnsmasq`.
+1. `journalctl -u dnsmasq -n 1000` to check the log of `dnsmasq`.
 1. Request a new IP address by disconnect and reconnect one of your devices' wifi.
 1. `nix shell nixpkgs#dhcpdump` and then `sudo dhcpdump -i br-lan`, check if the DHCP request is received by `dnsmasq`.
    1. The server listens on UDP port number 67, and the client listens on UDP port number 68.
diff --git a/hosts/idols_aquamarine/config.dae b/hosts/idols_aquamarine/config.dae
index f8584ae3..4d5150e0 100644
--- a/hosts/idols_aquamarine/config.dae
+++ b/hosts/idols_aquamarine/config.dae
@@ -18,10 +18,10 @@ global {
 
     # If not zero, traffic sent from dae will be set SO_MARK. It is useful to avoid traffic loop with iptables tproxy
     # rules.
-    so_mark_from_dae: 0
+    so_mark_from_dae: 1
 
     # Log level: error, warn, info, debug, trace.
-    log_level: debug
+    log_level: info
 
     # Disable waiting for network before pulling subscriptions.
     disable_waiting_network: false
@@ -205,6 +205,12 @@ group {
         policy: min_avg10
     }
 
+    github {
+        filter: name(keyword: 'UK')
+        filter: name(keyword: '英国')
+        policy: min_avg10
+    }
+
     sg {
         filter: name(keyword: 'Singapore')
         filter: name(keyword: '新加坡')
@@ -216,13 +222,6 @@ group {
         filter: name(keyword: '美国')
         policy: min_avg10
     }
-
-    uk {
-        filter: name(keyword: 'UK')
-        filter: name(keyword: '英国')
-        filter: name(keyword: '美国')
-        policy: min_avg10
-    }
 }
 
 # See https://github.com/daeuniverse/dae/blob/main/docs/en/configuration/routing.md for full examples.
@@ -269,8 +268,8 @@ routing {
 
     # --- Rules for other commonly used sites ---#
 
-    # Access github.com via UK's proxies
-    domain(geosite:github) -> uk
+    # Github
+    domain(geosite:github) -> github
 
     ### OpenAI
     domain(geosite:openai) -> sg