OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Merge pull request #315 from themactep/zerotier 

re-use config from web ui plugin. no config means no zerotier, anyway.
pull/316/head
Paul Philippov 2022-08-05 03:48:41 -04:00 committed by GitHub
parent a5a39aa1b3 98b1459dfe
commit ca3169ba5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
general/package/zerotier-one/files/S90zerotier
View File

@ -3,14 +3,19 @@
# Start zerotier-one # Start zerotier-one
# #
config_file=/etc/webui/zerotier.conf
[ ! -f "$config_file" ] && echo "Config file not found." && exit 2
source $config_file
case "$1" in case "$1" in
start) start)
if grep -q daemon=1 /etc/zerotier.conf; then if [ "true" = "$zerotier_enabled" ]; then
echo "Starting zerotier-one daemon..." echo "Starting zerotier-one daemon..."
/sbin/modprobe tun /sbin/modprobe tun
/usr/sbin/zerotier-one -d /usr/sbin/zerotier-one -d
else else
echo "Zerotier-One service disabled in zerotier.conf..." echo "Zerotier-One service is disabled in ${config_file}."
exit 3
fi fi
;; ;;
stop) stop)
@ -21,4 +26,5 @@ case "$1" in
*) *)
echo "Usage: $0 {start|stop}" echo "Usage: $0 {start|stop}"
exit 1 exit 1
;;
esac esac

1
general/package/zerotier-one/files/zerotier.conf
View File

@ -1 +0,0 @@
daemon=0

3
general/package/zerotier-one/zerotier-one.mk
View File

@ -20,9 +20,6 @@ endef
define ZEROTIER_ONE_INSTALL_TARGET_CMDS define ZEROTIER_ONE_INSTALL_TARGET_CMDS
$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
cp ../general/package/zerotier-one/files/zerotier.conf $(TARGET_DIR)/etc
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
cp ../general/package/zerotier-one/files/S90zerotier $(TARGET_DIR)/etc/init.d cp ../general/package/zerotier-one/files/S90zerotier $(TARGET_DIR)/etc/init.d
endef endef