From bab06cd11258ef7c9e240e5ec79e9cc9372c7278 Mon Sep 17 00:00:00 2001 From: Weston Blieden Date: Mon, 26 Sep 2022 15:27:31 +0200 Subject: [PATCH] Simplified Script --- aarch64/app/LICENSE | 14 ------ aarch64/app/Tailscale_VPN | 19 ++------ aarch64/app/html/index.html | 1 + aarch64/app/lib/tailscaled.service | 15 ------ aarch64/app/manifest.json | 5 +- aarch64/app/preuninstallscript.sh | 17 ------- aarch64/build/LICENSE | 14 ------ aarch64/build/Tailscale_VPN | 19 ++------ .../build/Tailscale_VPN_1_30_2_LICENSE.txt | 14 ------ aarch64/build/html/index.html | 1 + aarch64/build/lib/tailscaled.service | 15 ------ aarch64/build/manifest.json | 5 +- aarch64/build/package.conf | 4 +- aarch64/build/package.conf.orig | 3 +- aarch64/build/preuninstallscript.sh | 17 ------- arm/app/LICENSE | 14 ------ arm/app/Tailscale_VPN | 19 ++------ arm/app/html/index.html | 1 + arm/app/lib/tailscaled.service | 15 ------ arm/app/manifest.json | 5 +- arm/app/preuninstallscript.sh | 17 ------- arm/build/LICENSE | 14 ------ arm/build/Tailscale_VPN | 19 ++------ arm/build/Tailscale_VPN_1_30_0_LICENSE.txt | 43 ------------------ .../Tailscale_VPN_1_30_2_LICENSE.txt | 14 ------ arm/build/app/LICENSE | 43 ------------------ arm/build/app/Makefile | 1 - arm/build/app/Tailscale_VPN | 18 -------- arm/build/app/html/index.html | 18 -------- arm/build/app/lib/tailscaled.service | 15 ------ arm/build/app/manifest.json | 26 ----------- arm/build/app/package.conf | 22 --------- arm/build/app/package.conf.orig | 14 ------ arm/build/app/param.conf | 0 arm/build/app/preuninstallscript.sh | 17 ------- arm/build/html/index.html | 1 + arm/build/lib/tailscale | Bin 13337105 -> 13338859 bytes arm/build/lib/tailscaled | Bin 22948240 -> 22950810 bytes arm/build/lib/tailscaled.service | 15 ------ arm/build/manifest.json | 7 +-- arm/build/package.conf | 6 +-- arm/build/package.conf.orig | 5 +- arm/build/preuninstallscript.sh | 17 ------- 43 files changed, 37 insertions(+), 512 deletions(-) delete mode 100644 aarch64/app/lib/tailscaled.service delete mode 100755 aarch64/app/preuninstallscript.sh delete mode 100644 aarch64/build/lib/tailscaled.service delete mode 100755 aarch64/build/preuninstallscript.sh delete mode 100644 arm/app/lib/tailscaled.service delete mode 100755 arm/app/preuninstallscript.sh delete mode 100644 arm/build/Tailscale_VPN_1_30_0_LICENSE.txt rename arm/build/{app => }/Tailscale_VPN_1_30_2_LICENSE.txt (71%) delete mode 100644 arm/build/app/LICENSE delete mode 100644 arm/build/app/Makefile delete mode 100755 arm/build/app/Tailscale_VPN delete mode 100644 arm/build/app/html/index.html delete mode 100644 arm/build/app/lib/tailscaled.service delete mode 100644 arm/build/app/manifest.json delete mode 100644 arm/build/app/package.conf delete mode 100644 arm/build/app/package.conf.orig delete mode 100644 arm/build/app/param.conf delete mode 100755 arm/build/app/preuninstallscript.sh mode change 100644 => 100755 arm/build/lib/tailscale mode change 100644 => 100755 arm/build/lib/tailscaled delete mode 100644 arm/build/lib/tailscaled.service delete mode 100755 arm/build/preuninstallscript.sh diff --git a/aarch64/app/LICENSE b/aarch64/app/LICENSE index ecde149..9241b06 100644 --- a/aarch64/app/LICENSE +++ b/aarch64/app/LICENSE @@ -1,17 +1,3 @@ - Copyright (C) 2022 Axis Communications AB, Lund, Sweden - -  Licensed under the Apache License, Version 2.0 (the "License"); -  you may not use this file except in compliance with the License. -  You may obtain a copy of the License at -  -      -  -  Unless required by applicable law or agreed to in writing, software -  distributed under the License is distributed on an "AS IS" BASIS, -  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -  See the License for the specific language governing permissions and -  limitations under the License. - BSD 3-Clause License Copyright (c) 2020 Tailscale & AUTHORS. diff --git a/aarch64/app/Tailscale_VPN b/aarch64/app/Tailscale_VPN index bd3e795..b819acd 100755 --- a/aarch64/app/Tailscale_VPN +++ b/aarch64/app/Tailscale_VPN @@ -1,18 +1,9 @@ #!/bin/sh - -if [ ! -f "/etc/systemd/system/tailscaled.service" ] -then - echo "Service doesn't exist. Creating now" - cp -f /usr/local/packages/Tailscale_VPN/lib/tailscaled.service /etc/systemd/system + echo "Starting Service" chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscale chmod 777 /usr/local/packages/Tailscale_VPN/lib/tailscaled - systemctl daemon-reload - systemctl enable tailscaled.service - systemctl start tailscaled.service - echo "Service added" - /usr/local/packages/Tailscale_VPN/lib/tailscale up -else - echo "Service exists" - /usr/local/packages/Tailscale_VPN/lib/tailscale up -fi \ No newline at end of file + /usr/local/packages/Tailscale_VPN/lib/tailscaled & + echo "Service Started" + echo "Scroll to Bottom for link" + /usr/local/packages/Tailscale_VPN/lib/tailscale up \ No newline at end of file diff --git a/aarch64/app/html/index.html b/aarch64/app/html/index.html index 6e50e64..f0888d3 100644 --- a/aarch64/app/html/index.html +++ b/aarch64/app/html/index.html @@ -2,6 +2,7 @@ +

Scroll to the bottom to find authentication URL

- - - - - - - \ No newline at end of file diff --git a/arm/build/app/lib/tailscaled.service b/arm/build/app/lib/tailscaled.service deleted file mode 100644 index 11ba593..0000000 --- a/arm/build/app/lib/tailscaled.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Tailscale node agent -Documentation=https://tailscale.com/kb/ -Wants=network-pre.target -After=network-pre.target NetworkManager.service systemd-resolved.service - -[Service] -Type=simple -ExecStart=+/usr/local/packages/Tailscale_VPN/lib/tailscaled --state=/var/lib/tailscale/tailscaled.state -Restart=on-failure -RestartSec=10 -KillMode=process - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/arm/build/app/manifest.json b/arm/build/app/manifest.json deleted file mode 100644 index 9daa8e7..0000000 --- a/arm/build/app/manifest.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "schemaVersion": "1.3", - "acapPackageConf": { - "setup": { - "architecture": "armv7hf", - "appName": "Tailscale_VPN", - "friendlyName": "Tailscale VPN", - "vendor": "Tailscale", - "embeddedSdkVersion": "3.0", - "user": { - "group": "root", - "username": "root" - }, - "vendorUrl": "https://www.tailscale.com", - "runMode": "once", - "version": "1.30.2" - }, - "uninstallation": { - "preUninstallScript": "preuninstallscript.sh" - }, - "configuration": { - "settingPage": "index.html" - } - - } - } diff --git a/arm/build/app/package.conf b/arm/build/app/package.conf deleted file mode 100644 index a3329c8..0000000 --- a/arm/build/app/package.conf +++ /dev/null @@ -1,22 +0,0 @@ -PACKAGENAME="Tailscale VPN" -APPTYPE="armv7hf" -APPNAME="Tailscale_VPN" -APPID="" -LICENSENAME="Available" -LICENSEPAGE="none" -VENDOR="Tailscale" -REQEMBDEVVERSION="3.0" -APPMAJORVERSION="1" -APPMINORVERSION="30" -APPMICROVERSION="2" -APPGRP="root" -APPUSR="root" -APPOPTS="" -OTHERFILES="preuninstallscript.sh" -SETTINGSPAGEFILE="index.html" -SETTINGSPAGETEXT="" -VENDORHOMEPAGELINK='www.tailscale.com' -PREUPGRADESCRIPT="" -POSTINSTALLSCRIPT="" -STARTMODE="once" -HTTPCGIPATHS="" diff --git a/arm/build/app/package.conf.orig b/arm/build/app/package.conf.orig deleted file mode 100644 index e466803..0000000 --- a/arm/build/app/package.conf.orig +++ /dev/null @@ -1,14 +0,0 @@ -APPTYPE="armv7hf" -APPNAME="Tailscale_VPN" -PACKAGENAME="Tailscale VPN" -VENDOR="Tailscale" -REQEMBDEVVERSION="3.0" -APPGRP="root" -APPUSR="root" -VENDORHOMEPAGELINK='www.tailscale.com' -STARTMODE="once" -APPMAJORVERSION="1" -APPMINORVERSION="30" -APPMICROVERSION="2" -SETTINGSPAGEFILE="index.html" -OTHERFILES="preuninstallscript.sh" diff --git a/arm/build/app/param.conf b/arm/build/app/param.conf deleted file mode 100644 index e69de29..0000000 diff --git a/arm/build/app/preuninstallscript.sh b/arm/build/app/preuninstallscript.sh deleted file mode 100755 index 748bd53..0000000 --- a/arm/build/app/preuninstallscript.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - - -if [ ! -f "/etc/systemd/system/tailscaled.service" ] -then - echo "Service doesn't exist. Trying to remove anyway" - /usr/local/packages/Tailscale_VPN/lib/tailscale down - systemctl stop tailscaled.service - rm /etc/systemd/system/tailscaled.service - - echo "Service deleted" -else - echo "Service exists. Removing service" - /usr/local/packages/Tailscale_VPN/lib/tailscale down - systemctl stop tailscaled.service - rm /etc/systemd/system/tailscaled.service -fi \ No newline at end of file diff --git a/arm/build/html/index.html b/arm/build/html/index.html index 6e50e64..f0888d3 100644 --- a/arm/build/html/index.html +++ b/arm/build/html/index.html @@ -2,6 +2,7 @@ +

Scroll to the bottom to find authentication URL