Merge pull request #676 from Paraphraser/20230329-zerotier-old-menu

2023-03-29 ZeroTier - old-menu branch - PR 2 of 2

Author: Slyke

.templates/zerotier-client/service.yml

@@ -1,12 +1,13 @@
   zerotier-client:
-    image: zyclonite/zerotier
     container_name: zerotier
-    devices:
-      - /dev/net/tun
+    image: "zyclonite/zerotier"
+    restart: unless-stopped
     network_mode: host
     volumes:
-      - /var/lib/zerotier-one:/var/lib/zerotier-one
+    - ./volumes/zerotier-one:/var/lib/zerotier-one
+    devices:
+    - "/dev/net/tun:/dev/net/tun"
     cap_add:
-      - NET_ADMIN
-      - SYS_ADMIN
+    - NET_ADMIN
+    - SYS_ADMIN
 

.templates/zerotier-router/service.yml

@@ -1,22 +1,24 @@
   zerotier-router:
-    image: zyclonite/zerotier:router
     container_name: zerotier
-    devices:
-      - /dev/net/tun
+    image: "zyclonite/zerotier:router"
+    restart: unless-stopped
+    environment:
+    - TZ=${TZ:-Etc/UTC}
+    - PUID=1000
+    - PGID=1000
+#   - ZEROTIER_ONE_NETWORK_IDS=yourNetworkID
+    - ZEROTIER_ONE_LOCAL_PHYS=eth0 wlan0
+    - ZEROTIER_ONE_USE_IPTABLES_NFT=true
+    - ZEROTIER_ONE_GATEWAY_MODE=both
     network_mode: host
+    x-ports:
+    - "9993:9993"
     volumes:
-      - /var/lib/zerotier-one:/var/lib/zerotier-one
+    - ./volumes/zerotier-one:/var/lib/zerotier-one
+    devices:
+    - "/dev/net/tun:/dev/net/tun"
     cap_add:
-      - NET_ADMIN
-      - SYS_ADMIN
-      - NET_RAW
-    restart: unless-stopped
-    environment:
-      - TZ=Etc/UTC
-      - ZEROTIER_ONE_LOCAL_PHYS=eth0
-    # - ZEROTIER_ONE_NETWORK_IDS=yourNetworkID
-      - ZEROTIER_ONE_USE_IPTABLES_NFT=true
-      - ZEROTIER_ONE_GATEWAY_MODE=both
-      - PUID=1000
-      - PGID=1000
+    - NET_ADMIN
+    - SYS_ADMIN
+    - NET_RAW