From b4ec9f6d3ee20e27a7b0b20fd07c7493d0e16e90 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 24 Jun 2024 11:49:27 +0200
Subject: [PATCH 1/3] Add sky service in omr-bypass

---
 omr-bypass/files/etc/uci-defaults/41_omr-bypass | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/omr-bypass/files/etc/uci-defaults/41_omr-bypass b/omr-bypass/files/etc/uci-defaults/41_omr-bypass
index 8613d3bc3..d4cab9047 100755
--- a/omr-bypass/files/etc/uci-defaults/41_omr-bypass
+++ b/omr-bypass/files/etc/uci-defaults/41_omr-bypass
@@ -141,6 +141,17 @@ if [ "$(uci -q get omr-bypass.orange)" = "" ]; then
 		commit omr-bypass
 	EOF
 fi
+if [ "$(uci -q get omr-bypass.sky)" = "" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set omr-bypass.sky=proto
+		add_list omr-bypass.orange.url='sky.com'
+		add_list omr-bypass.orange.url='skycdp.com'
+		add_list omr-bypass.orange.url='skyanywhere.com'
+		add_list omr-bypass.orange.url='epgsky.com'
+		add_list omr-bypass.orange.url='skycdn.it'
+		commit omr-bypass
+	EOF
+fi
 #if [ "$(uci -q get omr-bypass.global)" = "" ]; then
 #	uci -q batch <<-EOF >/dev/null
 #		set omr-bypass.global=global

From bf9a0a4e214f2119cda7ef084bdb2fd0937cf280 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 24 Jun 2024 15:43:13 +0200
Subject: [PATCH 2/3] Force dnsmasq restart when setting IPs in
 omr-tracker-server

---
 omr-tracker/files/bin/omr-tracker-server | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
index 7fd8a6129..90e9631ed 100755
--- a/omr-tracker/files/bin/omr-tracker-server
+++ b/omr-tracker/files/bin/omr-tracker-server
@@ -317,6 +317,7 @@ _check_master() {
 			/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
 			/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
 			/etc/init.d/openvpn restart omr >/dev/null 2>/dev/null
+			/etc/init.d/dnsmasq restart >/dev/null 2>/dev/null
 		}
 		break
 	}
@@ -502,6 +503,7 @@ _check_backup() {
 			/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
 			/etc/init.d/shadowsocks-rust restart >/dev/null 2>/dev/null
 			/etc/init.d/openvpn restart omr >/dev/null 2>/dev/null
+			/etc/init.d/dnsmasq restart >/dev/null 2>/dev/null
 		}
 		[ "$server_ping" = true ] && break
 	}

From e8869d75c14bae7ce4d93bd863301f0b1ae32abc Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 24 Jun 2024 15:43:41 +0200
Subject: [PATCH 3/3] Change check for dnsmasq state in omr schedule

---
 omr-schedule/files/usr/share/omr/schedule.d/010-services | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omr-schedule/files/usr/share/omr/schedule.d/010-services b/omr-schedule/files/usr/share/omr/schedule.d/010-services
index 72825a5f6..bfdef06ee 100755
--- a/omr-schedule/files/usr/share/omr/schedule.d/010-services
+++ b/omr-schedule/files/usr/share/omr/schedule.d/010-services
@@ -33,7 +33,7 @@ if [ -f /etc/init.d/dnsmasq ]; then
 		_log "Can't find dnsmasq, restart it..."
 		/etc/init.d/dnsmasq restart 2>&1 >/dev/null
 		sleep 5
-	elif [ "$(uci -q get openmptcprouter.settings.external_check)" != "0" ] && [ -n "$(dig +timeout=4 +tries=1 openmptcprouter.com | grep 'connection refused')" ]; then
+	elif [ "$(uci -q get openmptcprouter.settings.external_check)" != "0" ] && [ -n "$(dig +timeout=4 +tries=1 openmptcprouter.com 2>&1 | grep -i 'connection refused')" ]; then
 		_log "Can't resolve via dnsmasq, restart it..."
 		/etc/init.d/dnsmasq restart 2>&1 >/dev/null
 		sleep 5