From d9348efe46d6ebbcbb85dcef895538b244670ea0 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 28 Aug 2023 22:28:57 -0500 Subject: [PATCH] Update linupx-scripts.sh --- linupx-scripts.sh | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/linupx-scripts.sh b/linupx-scripts.sh index 130a29e..4c20396 100755 --- a/linupx-scripts.sh +++ b/linupx-scripts.sh @@ -3,7 +3,7 @@ action="$1" FOLDER='/opt/idssys/linupx' -VERS='6.49-08282023' +VERS='6.51-08282023' if [ -d /opt/idssys/settings ]; then [ $(ls /opt/idssys/settings | wc -l) -eq 0 ] && rm -rf /opt/idssys/settings @@ -600,19 +600,47 @@ DSMON_INSTALL() { echo bash <(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/install-dsmon.sh) echo - if [ ${action-x} ]; then exit 0; fi - read -n 1 -s -p "Press any key to continue";; + ENTER2CONTINUE + esac +} +TAILSCALE_INSTALL() { + echo "This script currently only works with Ubuntu" + read -n 1 -p "Are you sure you wish to install Tailscale (Y/n)?" choice + case "$choice" in + [Nn]) INSTALL_MENU;; + * ) + echo + + rm -f /usr/share/keyrings/tailscale-archive-keyring.gpg /etc/apt/sources.list.d/tailscale.list >/dev/null 2>&1 + + curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/$(lsb_release --codename --short).noarmor.gpg | sudo tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null + curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/$(lsb_release --codename --short).tailscale-keyring.list | sudo tee /etc/apt/sources.list.d/tailscale.list + ${APTFUNC} update + ${APTFUNC} install tailscale + echo + + read -n 1 -p "Tailscale is now installed, would you like to connect to https://headscale.scity.us?" choice + case "$choice" in + [Nn]) INSTALL_MENU;; + * ) + tailscale up --accept-dns=false --login-server=https://headscale.scity.us --accept-routes=false + ;; + esac + echo + ENTER2CONTINUE + ;; esac } ENABLE_REMOTESYSLOG(){ read -n 1 -p "Are you sure you wish to enable sending syslogs to ${RemoteSyslogServer} (Y/n)?" choice case "$choice" in - [Nn]) SCRIPT_MENU;; - * ) - echo - echo -e "\n\n*.* @${RemoteSyslogServer}:514" >> /etc/rsyslog.d/50-default.conf - service rsyslog restart - SCRIPT_MENU;; + [Nn]) SCRIPT_MENU;; + * ) + echo + echo -e "\n\n*.* @${RemoteSyslogServer}:514" >> /etc/rsyslog.d/50-default.conf + service rsyslog restart + SCRIPT_MENU + ;; esac } PYTHON3UPGRADE(){