From a0c9bacbd9f8d66127339ff26d13094881361be7 Mon Sep 17 00:00:00 2001
From: cronyx <xcronyx@gmail.com>
Date: Tue, 27 Aug 2024 22:14:26 +0300
Subject: [PATCH] [no ci] zt revert config location (#1539)

---
 general/package/zerotier-one/files/S90zerotier   | 9 ++++-----
 general/package/zerotier-one/files/zerotier.conf | 1 +
 general/package/zerotier-one/zerotier-one.mk     | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 general/package/zerotier-one/files/zerotier.conf

diff --git a/general/package/zerotier-one/files/S90zerotier b/general/package/zerotier-one/files/S90zerotier
index 703a83a1..6d4937f0 100755
--- a/general/package/zerotier-one/files/S90zerotier
+++ b/general/package/zerotier-one/files/S90zerotier
@@ -1,18 +1,17 @@
 #!/bin/sh
 
-config_file=/etc/webui/zerotier.conf
-if [ -e "$config_file" ]; then
-	. $config_file
+if [ -e /etc/zerotier.conf ]; then
+	. /etc/zerotier.conf
 fi
 
 case "$1" in
 	start)
-		if [ "$zerotier_enabled" = "true" ]; then
+		if [ "$enabled" = "true" ]; then
 			echo "Starting zerotier-one daemon..."
 			modprobe tun
 			zerotier-one -d
 		else
-			echo "Zerotier-One service is disabled in ${config_file}."
+			echo "Zerotier-One service is disabled in /etc/zerotier.conf."
 			exit 1
 		fi
 		;;
diff --git a/general/package/zerotier-one/files/zerotier.conf b/general/package/zerotier-one/files/zerotier.conf
new file mode 100644
index 00000000..541deecb
--- /dev/null
+++ b/general/package/zerotier-one/files/zerotier.conf
@@ -0,0 +1 @@
+enabled=false
diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk
index dee24ee1..dde75c99 100644
--- a/general/package/zerotier-one/zerotier-one.mk
+++ b/general/package/zerotier-one/zerotier-one.mk
@@ -26,10 +26,11 @@ endef
 define ZEROTIER_ONE_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
 
-	if grep -q "BR2_PACKAGE_WEBUI=y" $(BR2_CONFIG); then \
-		$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d ; \
-		cp $(ZEROTIER_ONE_PKGDIR)/files/S90zerotier $(TARGET_DIR)/etc/init.d ; \
-	fi
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
+	cp $(ZEROTIER_ONE_PKGDIR)/files/zerotier.conf $(TARGET_DIR)/etc/zerotier.conf
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
+	cp $(ZEROTIER_ONE_PKGDIR)/files/S90zerotier $(TARGET_DIR)/etc/init.d
 endef
 
 $(eval $(generic-package))