diff --git a/README.md b/README.md index 6d006d9..0e0b49f 100644 --- a/README.md +++ b/README.md @@ -3,18 +3,14 @@ This ACAP packages the scripts and files required to install the Tailscale VPN client on Axis Cameras. Current version 1.60.0, -There is also now a version called "Auto Update" that will automatically keep tailscale up to date. + +The "Auto Update" version has been removed since it no longer works given the files are not stored in the default location. https://tailscale.com/changelog/ -## Warning -Unfortunately Axis is making changes to its firmware that will have breaking changes for a lot of ACAPs including my own and as of today there is no way to ready my ACAPs for these changes. - -You can read more here - -https://help.axis.com/en-us/axis-os#upcoming-breaking-changes +## Good news, everyone! -If you have a use case where certain functionality used by an ACAP application currently requires root-user permissions or have a question about ACAP application signing, please contact Axis at acap-privileges@axis.com +We have found a way to run the Tailscale ACAP without root privileges and will be releasing an update in the coming days allowing it to run on Axis OS 12. Thank you for your continued support. diff --git a/aarch64 Auto Update/Dockerfile b/aarch64 Auto Update/Dockerfile deleted file mode 100644 index eb1938e..0000000 --- a/aarch64 Auto Update/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -ARG ARCH=aarch64 -ARG VERSION=1.3 -ARG UBUNTU_VERSION=22.04 -ARG REPO=axisecp -ARG SDK=acap-native-sdk - -FROM ${REPO}/${SDK}:${VERSION}-${ARCH}-ubuntu${UBUNTU_VERSION} - -# Building the ACAP application -COPY ./app /opt/app/ -WORKDIR /opt/app -RUN . /opt/axis/acapsdk/environment-setup* && acap-build ./ diff --git a/aarch64 Auto Update/README.md b/aarch64 Auto Update/README.md deleted file mode 100644 index 6e0fc02..0000000 --- a/aarch64 Auto Update/README.md +++ /dev/null @@ -1,5 +0,0 @@ -To build, from main directory - -docker build --tag aarch64 . - -docker cp $(docker create aarch64):/opt/app ./build \ No newline at end of file diff --git a/aarch64 Auto Update/app/LICENSE b/aarch64 Auto Update/app/LICENSE deleted file mode 100644 index 9241b06..0000000 --- a/aarch64 Auto Update/app/LICENSE +++ /dev/null @@ -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. \ No newline at end of file diff --git a/aarch64 Auto Update/app/Makefile b/aarch64 Auto Update/app/Makefile deleted file mode 100644 index 74caba9..0000000 --- a/aarch64 Auto Update/app/Makefile +++ /dev/null @@ -1 +0,0 @@ -nop: \ No newline at end of file diff --git a/aarch64 Auto Update/app/Tailscale_VPN_Auto_Update b/aarch64 Auto Update/app/Tailscale_VPN_Auto_Update deleted file mode 100755 index 2c24bb3..0000000 --- a/aarch64 Auto Update/app/Tailscale_VPN_Auto_Update +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - - echo "Starting Service" - chmod 777 /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale - chmod 777 /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscaled - /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscaled & - echo "Service Started" - echo "Scroll to Bottom for link" - /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale up - /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale set --auto-update - wait \ No newline at end of file diff --git a/aarch64 Auto Update/app/html/index.html b/aarch64 Auto Update/app/html/index.html deleted file mode 100644 index e5d0062..0000000 --- a/aarch64 Auto Update/app/html/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - -

Scroll to the bottom to find authentication URL

- - - - - - - - \ No newline at end of file diff --git a/aarch64 Auto Update/app/manifest.json b/aarch64 Auto Update/app/manifest.json deleted file mode 100644 index 8d83761..0000000 --- a/aarch64 Auto Update/app/manifest.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "schemaVersion": "1.3", - "acapPackageConf": { - "setup": { - "appName": "Tailscale_VPN_Auto_Update", - "friendlyName": "Tailscale VPN Auto Update", - "vendor": "Tailscale - Packaged by Mo3he", - "embeddedSdkVersion": "3.0", - "user": { - "group": "root", - "username": "root" - }, - "vendorUrl": "https://www.tailscale.com", - "runMode": "once", - "version": "1.0.0" - }, - "configuration": { - "settingPage": "index.html" - } - } - } diff --git a/aarch64/app/Tailscale_VPN b/aarch64/app/Tailscale_VPN index b610861..063aa9c 100755 --- a/aarch64/app/Tailscale_VPN +++ b/aarch64/app/Tailscale_VPN @@ -3,8 +3,8 @@ 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 & + /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 up + /usr/local/packages/Tailscale_VPN/lib/tailscale --socket=/usr/local/packages/Tailscale_VPN/tailscaled.sock up wait \ No newline at end of file diff --git a/arm Auto Update/Dockerfile b/arm Auto Update/Dockerfile deleted file mode 100644 index 3b4b59c..0000000 --- a/arm Auto Update/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -ARG ARCH=armv7hf -ARG VERSION=1.3 -ARG UBUNTU_VERSION=22.04 -ARG REPO=axisecp -ARG SDK=acap-native-sdk - -FROM ${REPO}/${SDK}:${VERSION}-${ARCH}-ubuntu${UBUNTU_VERSION} - -# Building the ACAP application -COPY ./app /opt/app/ -WORKDIR /opt/app -RUN . /opt/axis/acapsdk/environment-setup* && acap-build ./ diff --git a/arm Auto Update/README.md b/arm Auto Update/README.md deleted file mode 100644 index adf52d5..0000000 --- a/arm Auto Update/README.md +++ /dev/null @@ -1,5 +0,0 @@ -To build from main directory - -docker build --tag arm . - -docker cp $(docker create arm):/opt/app ./build \ No newline at end of file diff --git a/arm Auto Update/app/LICENSE b/arm Auto Update/app/LICENSE deleted file mode 100644 index 9241b06..0000000 --- a/arm Auto Update/app/LICENSE +++ /dev/null @@ -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. \ No newline at end of file diff --git a/arm Auto Update/app/Makefile b/arm Auto Update/app/Makefile deleted file mode 100644 index 74caba9..0000000 --- a/arm Auto Update/app/Makefile +++ /dev/null @@ -1 +0,0 @@ -nop: \ No newline at end of file diff --git a/arm Auto Update/app/Tailscale_VPN_Auto_Update b/arm Auto Update/app/Tailscale_VPN_Auto_Update deleted file mode 100755 index 2c24bb3..0000000 --- a/arm Auto Update/app/Tailscale_VPN_Auto_Update +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - - echo "Starting Service" - chmod 777 /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale - chmod 777 /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscaled - /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscaled & - echo "Service Started" - echo "Scroll to Bottom for link" - /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale up - /usr/local/packages/Tailscale_VPN_Auto_Update/lib/tailscale set --auto-update - wait \ No newline at end of file diff --git a/arm Auto Update/app/html/index.html b/arm Auto Update/app/html/index.html deleted file mode 100644 index e5d0062..0000000 --- a/arm Auto Update/app/html/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - -

Scroll to the bottom to find authentication URL

- - - - - - - - \ No newline at end of file diff --git a/arm Auto Update/app/manifest.json b/arm Auto Update/app/manifest.json deleted file mode 100644 index 8d83761..0000000 --- a/arm Auto Update/app/manifest.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "schemaVersion": "1.3", - "acapPackageConf": { - "setup": { - "appName": "Tailscale_VPN_Auto_Update", - "friendlyName": "Tailscale VPN Auto Update", - "vendor": "Tailscale - Packaged by Mo3he", - "embeddedSdkVersion": "3.0", - "user": { - "group": "root", - "username": "root" - }, - "vendorUrl": "https://www.tailscale.com", - "runMode": "once", - "version": "1.0.0" - }, - "configuration": { - "settingPage": "index.html" - } - } - }