Update Tailscale to v1.96.2

The tailscaled.state file in localdata will now persist across updates, so your camera stays connected to Tailscale without re-authentication

.github/workflows/build.yml

@@ -0,0 +1,169 @@
+name: Auto Build & Release Tailscale ACAP
+
+on:
+  schedule:
+    - cron: "0 0 * * *"   # Every Monday at 03:00 UTC
+  workflow_dispatch:
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    steps:
+
+    # 1. Checkout repo
+    - uses: actions/checkout@v3
+      with:
+        persist-credentials: true
+        fetch-depth: 0
+
+    # 2. Get latest Tailscale version
+    - name: Get latest Tailscale version
+      id: tailscale_version
+      run: |
+        # 1. Start from GitHub latest
+        GH_TAG=$(curl -s https://api.github.com/repos/tailscale/tailscale/releases/latest | jq -r .tag_name)
+        GH_VERSION=${GH_TAG#v}
+
+        echo "GitHub latest: $GH_VERSION"
+
+        # 2. See if static ARM build exists for that version
+        if curl -sfI "https://pkgs.tailscale.com/stable/tailscale_${GH_VERSION}_arm.tgz" > /dev/null; then
+          VERSION="$GH_VERSION"
+          echo "Using GitHub latest (has ARM package): $VERSION"
+        else
+          echo "No ARM package for $GH_VERSION, falling back to latest version on pkgs.tailscale.com"
+          # 3. Derive latest version that actually has an ARM tarball
+          VERSION=$(
+            curl -s https://pkgs.tailscale.com/stable/ \
+            | grep -o 'tailscale_[0-9.]*_arm\.tgz' \
+            | sed -E 's/^tailscale_([0-9.]+)_arm\.tgz$/\1/' \
+            | sort -V | tail -n1
+          )
+          echo "Fallback version: $VERSION"
+        fi
+
+        echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
+        echo "version=$VERSION" >> $GITHUB_OUTPUT
+    
+    - name: Get current repo version
+      id: current
+      run: |
+        CURRENT=$(find . -path "*/app/manifest.json" -exec jq -r '.acapPackageConf.setup.version' {} \; | sort -u | head -n1)
+        echo "CURRENT_VERSION=$CURRENT" >> $GITHUB_ENV
+        echo "Current repo version: $CURRENT"
+
+    - name: Compare versions
+      id: compare
+      run: |
+        echo "Repo version: $CURRENT_VERSION"
+        echo "Latest Tailscale version: $RELEASE_VERSION"
+
+        if [ "$CURRENT_VERSION" = "$RELEASE_VERSION" ]; then
+          echo "build_needed=false" >> $GITHUB_ENV
+          echo "Already up to date. Skipping build."
+        else
+          echo "build_needed=true" >> $GITHUB_ENV
+          echo "New version detected. Will build."
+        fi
+          
+    # 3. Download Tailscale binaries
+    - name: Download Tailscale binaries
+      if: env.build_needed == 'true'
+      run: |
+        mkdir -p tailscale_bins
+        curl -L "https://pkgs.tailscale.com/stable/tailscale_${RELEASE_VERSION}_arm.tgz" -o tailscale_arm.tgz
+        tar -xzf tailscale_arm.tgz -C tailscale_bins --strip-components=1
+        mv tailscale_bins/tailscale tailscale_bins/tailscale_arm
+        mv tailscale_bins/tailscaled tailscale_bins/tailscaled_arm
+
+        curl -L "https://pkgs.tailscale.com/stable/tailscale_${RELEASE_VERSION}_arm64.tgz" -o tailscale_arm64.tgz
+        tar -xzf tailscale_arm64.tgz -C tailscale_bins --strip-components=1
+        mv tailscale_bins/tailscale tailscale_bins/tailscale_arm64
+        mv tailscale_bins/tailscaled tailscale_bins/tailscaled_arm64
+
+    # 4. Build each folder, update manifest, and copy .eap files
+    - name: Build all folders
+      if: env.build_needed == 'true'
+      run: |
+        mkdir -p build
+        rm -rf releases
+        mkdir -p releases
+
+        for folder in */ ; do
+          [[ ! -d "$folder/app" ]] && continue
+          FOLDER_NAME="${folder%/}"  # remove trailing slash
+          echo "Processing folder $FOLDER_NAME"
+
+          # Detect architecture
+          if [[ "$FOLDER_NAME" == arm* ]]; then
+            cp tailscale_bins/tailscale_arm "$folder/app/lib/tailscale"
+            cp tailscale_bins/tailscaled_arm "$folder/app/lib/tailscaled"
+          else
+            cp tailscale_bins/tailscale_arm64 "$folder/app/lib/tailscale"
+            cp tailscale_bins/tailscaled_arm64 "$folder/app/lib/tailscaled"
+          fi
+
+          # Stage updated binaries for commit
+          git add "$folder/app/lib/tailscale" "$folder/app/lib/tailscaled"
+
+          # Detect variant suffix for .eap naming
+          if [[ "$FOLDER_NAME" == *_ROOT ]]; then
+            VARIANT="_root"
+          elif [[ "$FOLDER_NAME" == *_custom ]]; then
+            VARIANT="_custom"
+          else
+            VARIANT=""
+          fi
+
+          # Update manifest version
+          sed -i "s/\"version\": \".*\"/\"version\": \"${RELEASE_VERSION}\"/" "$folder/app/manifest.json"
+
+          # Docker build
+          TAG_NAME=$(echo "$FOLDER_NAME" | tr '[:upper:]' '[:lower:]' | tr '/ ' '_')  # lowercase and clean
+          echo "Building $TAG_NAME"
+          docker build -f "$folder/Dockerfile" --tag "$TAG_NAME" "$folder"
+
+          # Extract .eap files into build folder
+          EAP_OUTPUT="./build/${TAG_NAME}"
+          mkdir -p "$EAP_OUTPUT"
+          docker cp $(docker create "$TAG_NAME"):/opt/app "$EAP_OUTPUT"
+
+          # Move all .eap files to releases folder, append variant if needed
+          find "$EAP_OUTPUT" -type f -name "*.eap" | while read eap; do
+            BASENAME=$(basename "$eap" .eap)
+            if [[ -n "$VARIANT" ]]; then
+              mv "$eap" "releases/${BASENAME}${VARIANT}.eap"
+            else
+              mv "$eap" "releases/${BASENAME}.eap"
+            fi
+          done
+        done
+
+        # Clean up
+        rm -rf build tailscale_bins *.tgz
+
+    # 5. Commit updated manifests and .eap files directly to main
+    - name: Commit updates to main
+      if: env.build_needed == 'true'
+      run: |
+        git config user.name "github-actions[bot]"
+        git config user.email "github-actions[bot]@users.noreply.github.com"
+        # Only commit manifests; do not track release artifacts
+        git add */app/manifest.json
+        if git diff --cached --quiet; then
+          echo "No changes to commit"
+        else
+          git commit -m "Update Tailscale to v${RELEASE_VERSION}"
+          git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/Mo3he/Axis_Cam_Tailscale.git main
+        fi
+
+    # 6. Create GitHub Release with all new .eap files
+    - name: Create GitHub Release
+      if: env.build_needed == 'true'
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: v${{ env.RELEASE_VERSION }}
+        name: "Tailscale VPN ${{ env.RELEASE_VERSION }}"
+        files: releases/*
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,2 +1,10 @@
 **/.DS_Store
 **/build
+
+# Do not track release artifacts
+releases/
+build/
+
+# Do not track downloaded Tailscale tarballs and temp bins
+tailscale_bins/
+*.tgz

README.md

@@ -1,117 +1,143 @@
-# The Tailscale installer ACAP
+# Tailscale Installer ACAP for Axis Cameras
 
-This ACAP packages the scripts and files required to install the Tailscale VPN client on Axis Cameras.
+This repository contains an **ACAP package** that installs the [Tailscale VPN client](https://tailscale.com/) on Axis cameras.
 
-Current version 1.82.0
+- ✅ Secure remote access to cameras  
+- ✅ Easy to install via EAP package  
+- ✅ Works on **Axis OS 12+** (non-root version)  
+- ✅ Based on **WireGuard VPN** technology  
 
-https://tailscale.com/changelog/
+[![Releases](https://img.shields.io/github/v/release/Mo3he/Axis_Cam_Tailscale)](https://github.com/Mo3he/Axis_Cam_Tailscale/releases)  
+[![License](https://img.shields.io/github/license/Mo3he/Axis_Cam_Tailscale)](LICENSE)  
+[![Sponsor](https://img.shields.io/badge/sponsor-%E2%9D%A4-lightgrey?logo=github)](https://github.com/sponsors/Mo3he)
 
-The "ROOT" versions require root privileges on the camera and will not work on OS 12 up.
+---
 
-If you like my work and want to help me to keep maintaining it, a sponsor would be amazing, every bit helps.
+## 📑 Table of Contents
 
-[:dollar: Sponsor](https://github.com/sponsors/Mo3he)
+- [📥 Installation](#-installation)  
+- [🚀 Usage](#-usage)  
+- [🔄 Updating Tailscale](#-updating-tailscale)  
+- [🧪 Testers Needed](#-testers-needed)  
+- [🎉 Good News](#-good-news)  
+- [🎯 Purpose](#-purpose)  
+- [🔗 Useful Links](#-useful-links)  
+- [🖥️ Compatibility](#️-compatibility)  
+- [⭐ Star History](#-star-history)  
+- [💖 Support](#-support)  
 
-## Testers needed
+---
 
-I have added a new "custom" version (Tailscale_VPN_Custom_1_82_0_aarch64.eap) which allows you to set a custom server and auth key for use of headscale.
+## 📥 Installation
 
-Click the three dots then "settings" to add your details.
-If you get a tls error restart the app.
+The recommended way is to use the **prebuilt `.eap` file** from the [Releases page](https://github.com/Mo3he/Axis_Cam_Tailscale/releases).
 
-Please give it a try and let me know if it works well or if you have issues.
+1. Log into your Axis camera.  
+2. Go to **Apps → Add App**.  
+3. Upload the `.eap` file.  
 
-## Good news, everyone!
+Once installed:
+- Start the app. 
+- Click **Open** to view logs and get your Tailscale authentication URL.  
+- On uninstall, all changes/files are removed.  
 
-We have found a way to run the Tailscale ACAP without root privileges allowing it to run on Axis OS 12.
+> ⚠️ You’ll need a [Tailscale account](https://tailscale.com/) to authenticate.
 
-Please note this new version runs in user space networking mode and therefore has some limitations, most notably the camera will not be able to connect out to other Tailscale nodes.
-This does not affect the normal use case of using Tailscale to connect to the camera.
-If you require full functionality, please do not upgrade to Axis OS 12 and use the version marked "ROOT".
+---
 
-The changes are implemented from version 1.68.1 of the acap.
+## 🚀 Usage
 
-Thank you for your continued support.
+- Runs a startup script to set permissions and launch Tailscale.  
+- View logs via the **Open** button in the app.  
+- Authenticate using the provided URL.  
 
-## Purpose
+---
 
-Adding a VPN client directly to the camera allows secure remote access to the device without requiring any other equipment or network configuration.
-Tailscale achieves this in a secure, simple to setup and easy to use way.
-Tailscale is based on WireGuard VPN tunneling technology.
+## 🔄 Updating Tailscale
 
-https://tailscale.com/blog/how-tailscale-works/
+- New `.eap` files are auto-built and released **weekly** (if a new Tailscale version is available).  
+- To update, simply install the new `.eap` over the existing one.  
 
-## Links
+### Manual update (advanced)
 
-https://tailscale.com/
+Replace the binaries in the `lib/` folder:
+- `tailscale`
+- `tailscaled`
 
-https://github.com/tailscale/tailscale 
+Download the latest versions: [Tailscale static builds](https://pkgs.tailscale.com/stable/#static)
 
-https://www.wireguard.com/
+#### Build locally
 
-https://www.axis.com/
+From the main directory of the version you want (`arm` / `aarch64`):
 
-## Compatibility
-
-The Tailscale ACAP is compatable with Axis cameras with arm and aarch64 based Soc's.
-
-```
-curl --anyauth "*" -u <username>:<password> <device ip>/axis-cgi/basicdeviceinfo.cgi --data "{\"apiVersion\":\"1.0\",\"context\":\"Client defined request ID\",\"method\":\"getAllProperties\"}"
+```bash
+docker build --tag <package_name> .
+docker cp $(docker create <package_name>):/opt/app ./build
 ```
 
-where `<device ip>` is the IP address of the Axis device, `<username>` is the root username and `<password>` is the root password. Please
-note that you need to enclose your password with quotes (`'`) if it contains special characters.
+---
 
-## Installing
+## 🧪 Testers Needed
 
-The recommended way to install this ACAP is to use the pre built eap file.
-Go to "Apps" on the camera and click "Add app".
+A new **custom** version is available:
+- Allows setting a custom server and auth key (for [Headscale](https://headscale.net/)).  
+- Go to **Settings (⋮ → Settings)** to add your details.   
 
+Please give it a try and share your feedback!
 
-## Using the Tailscale ACAP
+---
 
-The Tailscale ACAP will run a script on startup that sets the required permissions and starts the service and app.
-Once started click "Open" to see the output of the logs for further instructions and obtain the authetication URL.
+## 🎉 Good News
 
-When uninstalling the ACAP, all changes and files are removed from the camera.
+Tailscale ACAP can now run **without root privileges**, making it compatible with **Axis OS 12+**.  
 
-You will need a tailscale.com account to use the ACAP
+- Runs in **user space networking mode**.  
 
-## Updating Tailscale version
+For **full networking features**, use the **ROOT** version on Axis OS < 12.
 
-The eap files will be updated from time to time and simply installing the new version over the old will update all files.
+---
 
-It's also possible to build and use a locally built image as all necesary files are provided.
+## 🎯 Purpose
 
-Replace binaries "tailscale" and "tailscaled" in lib folder with new versions.
-Make sure you use the files for the correct Soc.
+Adding a VPN client directly to the camera enables:  
+- Secure remote access without additional hardware or complex network configuration.  
+- Easy setup through Tailscale’s lightweight WireGuard-based tunnel.  
 
-Latest versions can be found at 
+🔗 Learn more: [How Tailscale Works](https://tailscale.com/blog/how-tailscale-works/)
 
-https://pkgs.tailscale.com/stable/#static
+---
 
+## 🔗 Useful Links
 
-To build, 
-From main directory of the version you want (arm/aarch64)
+- [Tailscale](https://tailscale.com/)  
+- [Tailscale GitHub](https://github.com/tailscale/tailscale)  
+- [WireGuard](https://www.wireguard.com/)  
+- [Axis Communications](https://www.axis.com/)  
 
-```
-docker build --tag <package name> . 
-```
-```
-docker cp $(docker create <package name>):/opt/app ./build 
+---
+
+## 🖥️ Compatibility
+
+The Tailscale ACAP is compatible with Axis cameras with **ARM** and **AARCH64**-based SoCs.
+
+You can verify your device details using the following command:
+
+```bash
+curl --anyauth "*" -u <username>:<password> <device_ip>/axis-cgi/basicdeviceinfo.cgi --data '{"apiVersion":"1.0","context":"Client defined request ID","method":"getAllProperties"}'
 ```
 
-Thanks to wesQ3 there is now also a version in the "all" folder with a script that simplifies the build process with the following changes.
+> Replace `<device_ip>`, `<username>`, and `<password>` with your device credentials.  
+> Enclose your password in quotes `' '` if it contains special characters.
 
-1. Architecture specific build directories are not required, target arch is now an argument
+---
 
-2. manifest files are templated as part of the build
-
-3. Tailscale binaries are downloaded as part of the build
-
-
-## Star History
+## ⭐ Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=Mo3he/Axis_Cam_Tailscale&type=Date)](https://www.star-history.com/#Mo3he/Axis_Cam_Tailscale&Date)
 
+---
 
+## 💖 Support
+
+If you like this project and want to support future updates:  
+👉 [Sponsor Me](https://github.com/sponsors/Mo3he)

aarch64/app/Tailscale_VPN

@@ -1,10 +1,30 @@
 #!/bin/sh
 
-    echo "Starting Service"
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscale
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscaled
-    /usr/local/packages/Tailscale_VPN/lib/tailscaled --tun=userspace-networking --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock &
-    echo "Service Started"
-    echo "Scroll to Bottom for link"
-    /usr/local/packages/Tailscale_VPN/lib/tailscale --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock up
-    wait
+echo "Starting Service"
+
+# Define paths
+APP_DIR="/usr/local/packages/Tailscale_VPN"
+STATE_DIR="$APP_DIR/localdata"
+
+# Create localdata directory if it doesn't exist
+mkdir -p "$STATE_DIR"
+
+# Set permissions
+chmod 777 "$APP_DIR/lib/tailscale"
+chmod 777 "$APP_DIR/lib/tailscaled"
+
+# Start tailscaled with state stored in localdata
+"$APP_DIR/lib/tailscaled" \
+    --state="$STATE_DIR/tailscaled.state" \
+    --socket="$STATE_DIR/tailscaled.sock" \
+    --socks5-server=localhost:1055 \
+    --tun=userspace-networking &
+
+echo "Service Started"
+sleep 2
+echo "Scroll to Bottom for link"
+
+# Run tailscale up with the socket in localdata
+"$APP_DIR/lib/tailscale" --socket="$STATE_DIR/tailscaled.sock" up
+
+wait

aarch64/app/manifest.json

@@ -8,11 +8,11 @@
             "embeddedSdkVersion": "3.0",
             "vendorUrl": "https://www.tailscale.com",
             "runMode": "once",
-            "version": "1.84.0",
+            "version": "1.96.2",
             "architecture": "aarch64"
         },
         "configuration": {
             "settingPage": "index.html"
         }
     }
-}
+}

aarch64_ROOT/app/Tailscale_VPN

@@ -1,10 +1,28 @@
 #!/bin/sh
 
-    echo "Starting Service"
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscale
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscaled
-    /usr/local/packages/Tailscale_VPN/lib/tailscaled &
-    echo "Service Started"
-    echo "Scroll to Bottom for link"
-    /usr/local/packages/Tailscale_VPN/lib/tailscale up --accept-routes
-    wait
+echo "Starting Service"
+
+# Define paths
+APP_DIR="/usr/local/packages/Tailscale_VPN"
+STATE_DIR="$APP_DIR/localdata"
+
+# Create localdata directory if it doesn't exist
+mkdir -p "$STATE_DIR"
+
+# Set permissions
+chmod 777 "$APP_DIR/lib/tailscale"
+chmod 777 "$APP_DIR/lib/tailscaled"
+
+# Start tailscaled with state stored in localdata
+"$APP_DIR/lib/tailscaled" \
+    --state="$STATE_DIR/tailscaled.state" \
+    --socket="$STATE_DIR/tailscaled.sock" &
+
+echo "Service Started"
+sleep 2
+echo "Scroll to Bottom for link"
+
+# Run tailscale up with the socket in localdata
+"$APP_DIR/lib/tailscale" --socket="$STATE_DIR/tailscaled.sock" up --accept-routes
+
+wait

aarch64_ROOT/app/manifest.json

@@ -12,11 +12,11 @@
           },
             "vendorUrl": "https://www.tailscale.com",
             "runMode": "once",
-            "version": "1.84.0",
+            "version": "1.96.2",
             "architecture": "aarch64"
         },
         "configuration": {
             "settingPage": "index.html"
         }
     }
-}
+}

aarch64_custom/app/config_updater.c

@@ -17,7 +17,9 @@
 #include <errno.h>
 
 #define APP_NAME "serverconfig"
-#define CONFIG_FILE "/usr/local/packages/serverconfig/config.txt"
+#define APP_DIR "/usr/local/packages/serverconfig"
+#define STATE_DIR APP_DIR "/localdata"
+#define CONFIG_FILE STATE_DIR "/config.txt"
 #define SCRIPT_PATH "/usr/local/packages/serverconfig/start_tailscale.sh"
 #define SCRIPT_SOURCE "/usr/local/packages/serverconfig/lib/start_tailscale.sh"
 
@@ -27,6 +29,19 @@ static gboolean signal_handler(gpointer loop) {
     return G_SOURCE_REMOVE;
 }
 
+// Create localdata directory
+static void ensure_localdata_exists(void) {
+    struct stat st = {0};
+    
+    if (stat(STATE_DIR, &st) == -1) {
+        if (mkdir(STATE_DIR, 0755) != 0) {
+            syslog(LOG_ERR, "Failed to create localdata directory: %s", strerror(errno));
+        } else {
+            syslog(LOG_INFO, "Created localdata directory: %s", STATE_DIR);
+        }
+    }
+}
+
 // Copy script from lib folder to main directory
 static void copy_script_file(void) {
     char buffer[4096];
@@ -109,6 +124,9 @@ static void update_config_file(AXParameter* handle) {
     gchar* key_value = NULL;
     FILE* file;
     
+    // Ensure localdata directory exists
+    ensure_localdata_exists();
+    
     // Get parameter values
     if (!ax_parameter_get(handle, "CustomServer", &server_value, &error)) {
         syslog(LOG_ERR, "Failed to get CustomServer: %s", 
@@ -125,7 +143,7 @@ static void update_config_file(AXParameter* handle) {
         key_value = g_strdup("");
     }
     
-    // Write to config file
+    // Write to config file in localdata
     file = fopen(CONFIG_FILE, "w");
     if (file) {
         fprintf(file, "custom_server=%s\n", server_value ? server_value : "");
@@ -135,12 +153,12 @@ static void update_config_file(AXParameter* handle) {
         // Set permissions to ensure the file is readable
         chmod(CONFIG_FILE, 0644);
         
-        syslog(LOG_INFO, "Updated configuration file: custom_server=%s", 
+        syslog(LOG_INFO, "Updated configuration file in local custom_server=%s", 
                server_value ? server_value : "");
-        syslog(LOG_INFO, "Updated configuration file: auth_key=%s", 
+        syslog(LOG_INFO, "Updated configuration file in local auth_key=%s", 
                key_value && strlen(key_value) > 0 ? "(set)" : "(empty)");
     } else {
-        syslog(LOG_ERR, "Failed to open config file for writing");
+        syslog(LOG_ERR, "Failed to open config file for writing: %s", strerror(errno));
     }
     
     // Clean up
@@ -185,6 +203,9 @@ int main(void) {
         exit(1);
     }
 
+    // Ensure localdata directory exists
+    ensure_localdata_exists();
+    
     // Ensure script is copied from lib folder
     copy_script_file();
 
@@ -229,4 +250,4 @@ int main(void) {
     ax_parameter_free(handle);
     
     return 0;
-}
+}

aarch64_custom/app/lib/start_tailscale.sh

@@ -5,10 +5,15 @@
 pkill -f tailscaled || true
 
 # Simple script to start Tailscale with custom configuration
-CONFIG_FILE="/usr/local/packages/serverconfig/config.txt"
-TAILSCALED_PATH="/usr/local/packages/serverconfig/lib/tailscaled"
-TAILSCALE_PATH="/usr/local/packages/serverconfig/lib/tailscale"
-SOCKET_PATH="/usr/local/packages/serverconfig/tailscaled.sock"
+APP_DIR="/usr/local/packages/serverconfig"
+STATE_DIR="$APP_DIR/localdata"
+CONFIG_FILE="$STATE_DIR/config.txt"
+TAILSCALED_PATH="$APP_DIR/lib/tailscaled"
+TAILSCALE_PATH="$APP_DIR/lib/tailscale"
+SOCKET_PATH="$STATE_DIR/tailscaled.sock"
+
+# Create localdata directory if it doesn't exist
+mkdir -p "$STATE_DIR"
 
 # Log to syslog
 logger -t "tailscale_script" "Starting Tailscale VPN service"
@@ -31,9 +36,13 @@ if [ -f "$CONFIG_FILE" ]; then
     done < "$CONFIG_FILE"
 fi
 
-# Start tailscaled
+# Start tailscaled with state stored in localdata
 logger -t "tailscale_script" "Starting tailscaled daemon"
-$TAILSCALED_PATH --tun=userspace-networking --socket=$SOCKET_PATH &
+$TAILSCALED_PATH \
+    --state="$STATE_DIR/tailscaled.state" \
+    --socket=$SOCKET_PATH \
+    --socks5-server=localhost:1055 \
+    --tun=userspace-networking &
 TAILSCALED_PID=$!
 
 # Wait for tailscaled to initialize
@@ -61,4 +70,4 @@ logger -t "tailscale_script" "Tailscale VPN is running"
 logger -t "tailscale_script" "To change settings, modify parameters in ACAP web interface"
 
 # Wait for tailscaled process to exit
-wait $TAILSCALED_PID
+wait $TAILSCALED_PID

aarch64_custom/app/manifest.json

@@ -8,7 +8,7 @@
             "embeddedSdkVersion": "3.0",
             "vendorUrl": "https://www.tailscale.com",
             "runMode": "respawn",
-            "version": "1.84.0"
+            "version": "1.96.2"
         },
         "configuration": {
             "settingPage": "index.html",
@@ -26,4 +26,4 @@
             ]
         }
     }
-}
+}

all/Dockerfile

@@ -1,32 +0,0 @@
-# example usage:
-# docker build --build-arg ARCH=armv7hf --build-arg TAILSCALE_VERSION=1.70.0 -t axis_tailscale:latest .
-# docker cp $(docker create axis_tailscale):/opt/app ./build
-
-ARG REPO=axisecp
-ARG SDK=acap-native-sdk
-ARG VERSION=1.3
-ARG ARCH=armv7hf
-ARG UBUNTU_VERSION=22.04
-
-FROM ${REPO}/${SDK}:${VERSION}-${ARCH}-ubuntu${UBUNTU_VERSION}
-WORKDIR /opt/app
-COPY ./app /opt/app/
-
-ARG ARCH=armv7hf
-ARG TAILSCALE_VERSION=1.68.1
-
-# template files
-RUN sed -i "s/@@ARCH@@/${ARCH}/g" /opt/app/manifest.json \
-   && sed -i "s/@@TAILSCALE_VERSION@@/${TAILSCALE_VERSION}/g" /opt/app/manifest.json
-
-# tailscale uses "arm(64)" instead of the more specific arm arch names
-RUN \
-   if   [ "${ARCH}" = "armv7hf" ]; then TAILSCALE_ARCH="arm";   \
-   elif [ "${ARCH}" = "aarch64" ]; then TAILSCALE_ARCH="arm64"; \
-   else TAILSCALE_ARCH="${ARCH}"; fi \
-   && curl -sS --fail -L -o /tmp/tailscale.tgz https://pkgs.tailscale.com/stable/tailscale_${TAILSCALE_VERSION}_${TAILSCALE_ARCH}.tgz \
-   && mkdir -p /opt/app/lib \
-   && tar xzf /tmp/tailscale.tgz -C /opt/app/lib --strip-components=1 --wildcards --no-anchored '*/tailscale' '*/tailscaled' \
-   && rm /tmp/tailscale.tgz
-
-RUN . /opt/axis/acapsdk/environment-setup* && acap-build ./

all/README.md

@@ -1,18 +0,0 @@
-# Building
-
-Set your preferred build parameters via the docker build command.
-
-* `ARCH` - use the Axis architecture string you can fetch from `/axis-cgi/param.cgi?action=list&group=Properties.System.Architecture`
-* `TAILSCALE_VERSION` - Specify the version string as it appears on the [Tailscale archive](https://pkgs.tailscale.com/stable/#static)
-
-Tailscale arm arch strings are different than the axis format. The Dockerfile has some mappings for common strings.
-
-```
-docker build --build-arg ARCH=armv7hf --build-arg TAILSCALE_VERSION=1.70.0 -t axis_tailscale:latest .
-```
-
-Then copy out the build artifacts:
-
-```
-docker cp $(docker create axis_tailscale):/opt/app ./build
-```

all/app/LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2020 Tailscale & AUTHORS.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

all/app/Makefile

@@ -1 +0,0 @@
-nop:

all/app/Tailscale_VPN

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-    echo "Starting Service"
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscale
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscaled
-    /usr/local/packages/Tailscale_VPN/lib/tailscaled --tun=userspace-networking --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock &
-    echo "Service Started"
-    echo "Scroll to Bottom for link"
-    /usr/local/packages/Tailscale_VPN/lib/tailscale --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock up
-    wait

all/app/html/index.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<head>
-    <h1 style="color:red;">Scroll to the bottom to find authentication URL</h1>
-    <script>
-        function refreshIFrame() {
-            var x = document.getElementById("*Your_iframe_id*");
-            x.contentWindow.location.reload();
-            var t = setTimeout(refreshIFrame, 5000);
-        }
-    </script>
-</head>
-<body onload="refreshIFrame()"> 
-    <iframe id="*Your_iframe_id*" src= "/axis-cgi/admin/systemlog.cgi?appname=Tailscale_VPN" style="height:600px;width:100%;border: none;" ></iframe>
-</body>
-
-</body>
-</html>

all/app/manifest.json

@@ -1,18 +0,0 @@
-{
-    "schemaVersion": "1.3",
-    "acapPackageConf": {
-        "setup": {
-            "appName": "Tailscale_VPN",
-            "friendlyName": "Tailscale VPN",
-            "vendor": "Tailscale - Packaged by Mo3he",
-            "embeddedSdkVersion": "3.0",
-            "vendorUrl": "https://www.tailscale.com",
-            "runMode": "once",
-            "version": "@@TAILSCALE_VERSION@@",
-            "architecture": "@@ARCH@@"
-        },
-        "configuration": {
-            "settingPage": "index.html"
-        }
-    }
-}

arm/app/Tailscale_VPN

@@ -1,10 +1,30 @@
 #!/bin/sh
 
-    echo "Starting Service"
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscale
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscaled
-    /usr/local/packages/Tailscale_VPN/lib/tailscaled --tun=userspace-networking --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock &
-    echo "Service Started"
-    echo "Scroll to Bottom for link"
-    /usr/local/packages/Tailscale_VPN/lib/tailscale --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock up
-    wait
+echo "Starting Service"
+
+# Define paths
+APP_DIR="/usr/local/packages/Tailscale_VPN"
+STATE_DIR="$APP_DIR/localdata"
+
+# Create localdata directory if it doesn't exist
+mkdir -p "$STATE_DIR"
+
+# Set permissions
+chmod 777 "$APP_DIR/lib/tailscale"
+chmod 777 "$APP_DIR/lib/tailscaled"
+
+# Start tailscaled with state stored in localdata
+"$APP_DIR/lib/tailscaled" \
+    --state="$STATE_DIR/tailscaled.state" \
+    --socket="$STATE_DIR/tailscaled.sock" \
+    --socks5-server=localhost:1055 \
+    --tun=userspace-networking &
+
+echo "Service Started"
+sleep 2
+echo "Scroll to Bottom for link"
+
+# Run tailscale up with the socket in localdata
+"$APP_DIR/lib/tailscale" --socket="$STATE_DIR/tailscaled.sock" up
+
+wait

arm/app/manifest.json

@@ -8,11 +8,11 @@
             "embeddedSdkVersion": "3.0",
             "vendorUrl": "https://www.tailscale.com",
             "runMode": "once",
-            "version": "1.84.0",
+            "version": "1.96.2",
             "architecture": "armv7hf"
         },
         "configuration": {
             "settingPage": "index.html"
         }
     }
-}
+}

arm_ROOT/app/Tailscale_VPN

@@ -1,10 +1,28 @@
 #!/bin/sh
 
-    echo "Starting Service"
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscale
-    chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscaled
-    /usr/local/packages/Tailscale_VPN/lib/tailscaled &
-    echo "Service Started"
-    echo "Scroll to Bottom for link"
-    /usr/local/packages/Tailscale_VPN/lib/tailscale up --accept-routes
-    wait
+echo "Starting Service"
+
+# Define paths
+APP_DIR="/usr/local/packages/Tailscale_VPN"
+STATE_DIR="$APP_DIR/localdata"
+
+# Create localdata directory if it doesn't exist
+mkdir -p "$STATE_DIR"
+
+# Set permissions
+chmod 777 "$APP_DIR/lib/tailscale"
+chmod 777 "$APP_DIR/lib/tailscaled"
+
+# Start tailscaled with state stored in localdata
+"$APP_DIR/lib/tailscaled" \
+    --state="$STATE_DIR/tailscaled.state" \
+    --socket="$STATE_DIR/tailscaled.sock" &
+
+echo "Service Started"
+sleep 2
+echo "Scroll to Bottom for link"
+
+# Run tailscale up with the socket in localdata
+"$APP_DIR/lib/tailscale" --socket="$STATE_DIR/tailscaled.sock" up --accept-routes
+
+wait

arm_ROOT/app/manifest.json

@@ -12,11 +12,11 @@
           },
             "vendorUrl": "https://www.tailscale.com",
             "runMode": "once",
-            "version": "1.84.0",
+            "version": "1.96.2",
             "architecture": "armv7hf"
         },
         "configuration": {
             "settingPage": "index.html"
         }
     }
-}
+}