Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6930 from mwarning/zerotier

Browse source 
zerotier: fix multiple instance handling and port setting
This commit is contained in:
Dirk Brenken 2018-09-09 12:38:42 +02:00 committed by GitHub
commit eeb418d88a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/zerotier/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zerotier PKG_NAME:=zerotier
PKG_VERSION:=1.2.12 PKG_VERSION:=1.2.12
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
@ -66,10 +66,7 @@ ifeq ($(CONFIG_ZEROTIER_ENABLE_SELFTEST),y)
$(INSTALL_BIN) $(PKG_BUILD_DIR)/zerotier-selftest $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/zerotier-selftest $(1)/usr/bin/
endif endif
$(INSTALL_DIR) $(1)/etc/init.d/ $(CP) ./files/* $(1)/
$(INSTALL_BIN) files/zerotier.init $(1)/etc/init.d/zerotier
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) files/zerotier.config $(1)/etc/config/zerotier
endef endef
$(eval $(call BuildPackage,zerotier)) $(eval $(call BuildPackage,zerotier))

3
net/zerotier/files/zerotier.config → net/zerotier/files/etc/config/zerotier
View file

@ -8,7 +8,8 @@ config zerotier sample_config
#option port '9993' #option port '9993'
# Generate secret on first start # Generate secret on first start
option secret 'generate' option secret ''
# Join a public network called Earth # Join a public network called Earth
list join '8056c2e21c000001' list join '8056c2e21c000001'
#list join '<other_network>'

39
net/zerotier/files/zerotier.init → net/zerotier/files/etc/init.d/zerotier Normal file → Executable file
View file

@ -9,13 +9,13 @@ CONFIG_PATH=/var/lib/zerotier-one
section_enabled() { section_enabled() {
config_get_bool enabled "$1" 'enabled' 0 config_get_bool enabled "$1" 'enabled' 0
[ $enabled -gt 0 ] [ $enabled -ne 0 ]
} }
start_instance() { start_instance() {
local cfg="$1" local cfg="$1"
local port secret config_path local port secret config_path path
local ARGS="" local args=""
if ! section_enabled "$cfg"; then if ! section_enabled "$cfg"; then
echo "disabled in config" echo "disabled in config"
@ -23,29 +23,35 @@ start_instance() {
fi fi
config_get config_path $cfg 'config_path' config_get config_path $cfg 'config_path'
config_get_bool port $cfg 'port' config_get port $cfg 'port'
config_get secret $cfg 'secret' config_get secret $cfg 'secret'
path=${CONFIG_PATH}_$cfg
# Remove existing link or folder # Remove existing link or folder
rm -rf $CONFIG_PATH rm -rf $path
# Create link from CONFIG_PATH to config_path # Create link from CONFIG_PATH to config_path
if [ -n "$config_path" -a "$config_path" != $CONFIG_PATH ]; then if [ -n "$config_path" -a "$config_path" != "$path" ]; then
if [ ! -d "$config_path" ]; then if [ ! -d "$config_path" ]; then
echo "ZeroTier config_path does not exist: $config_path" echo "ZeroTier config_path does not exist: $config_path" 1>&2
return return
fi fi
ln -s $config_path $CONFIG_PATH ln -s $config_path $path
fi fi
mkdir -p $CONFIG_PATH/networks.d mkdir -p $path/networks.d
# link latest default config path to latest config path
rm -f $CONFIG_PATH
ln -s $path $CONFIG_PATH
if [ -n "$port" ]; then if [ -n "$port" ]; then
ARGS="$ARGS -p$port" args="$args -p${port}"
fi fi
if [ "$secret" = "generate" ]; then if [ -z "$secret" ]; then
echo "Generate secret - please wait..." echo "Generate secret - please wait..."
local sf="/tmp/zt.$cfg.secret" local sf="/tmp/zt.$cfg.secret"
@ -60,20 +66,20 @@ start_instance() {
fi fi
if [ -n "$secret" ]; then if [ -n "$secret" ]; then
echo "$secret" > $CONFIG_PATH/identity.secret echo "$secret" > $path/identity.secret
# make sure there is not previous identity.public # make sure there is not previous identity.public
rm -f $CONFIG_PATH/identity.public rm -f $path/identity.public
fi fi
add_join() { add_join() {
# an (empty) config file will cause ZT to join a network # an (empty) config file will cause ZT to join a network
touch $CONFIG_PATH/networks.d/$1.conf touch $path/networks.d/$1.conf
} }
config_list_foreach $cfg 'join' add_join config_list_foreach $cfg 'join' add_join
procd_open_instance procd_open_instance
procd_set_param command $PROG $ARGS $CONFIG_PATH procd_set_param command $PROG $args $path
procd_set_param stderr 1 procd_set_param stderr 1
procd_close_instance procd_close_instance
} }
@ -87,10 +93,11 @@ stop_instance() {
local cfg="$1" local cfg="$1"
# Remove existing link or folder # Remove existing link or folder
rm -rf $CONFIG_PATH rm -rf ${CONFIG_PATH}_${cfg}
} }
stop_service() { stop_service() {
config_load 'zerotier' config_load 'zerotier'
config_foreach stop_instance 'zerotier' config_foreach stop_instance 'zerotier'
rm -f ${CONFIG_PATH}
} }