Merge branch 'main' into v3.1.4

docker/Dockerfile

@@ -58,7 +58,7 @@ ENV WEBROOT="./www"
 ENV ZTAUTH=""
 ENV ZTPORT="9993"
 
-VOLUME [ "/opt/zoraxy/config/", "/var/lib/zerotier-one/" ]
+VOLUME [ "/opt/zoraxy/config/" ]
 
 ENTRYPOINT [ "/opt/zoraxy/entrypoint.sh" ]
 

docker/entrypoint.sh

@@ -4,6 +4,10 @@ update-ca-certificates
 echo "CA certificates updated"
 
 if [ "$ZEROTIER" = "true" ]; then
+  if [ ! -d "/opt/zoraxy/config/zerotier/" ]; then
+    mkdir -p /opt/zoraxy/config/zerotier/
+  fi
+  ln -s /opt/zoraxy/config/zerotier/ /var/lib/zerotier-one
   zerotier-one -d
   echo "ZeroTier daemon started"
 fi

src/main.go

@@ -46,6 +46,7 @@ import (
 	"imuslab.com/zoraxy/mod/utils"
 )
 
+
 /* SIGTERM handler, do shutdown sequences before closing */
 func SetupCloseHandler() {
 	c := make(chan os.Signal, 2)