From 782145ce2442d4c25bd0247421bbfb87ee684ca2 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 6 May 2023 10:11:04 -0500 Subject: [PATCH] update --- add-linux-pass.sh | 9 +++++++-- add-veeam-user.sh | 9 +++++++-- cc-cleaner.sh | 10 +++++++--- install-dsmon.sh | 9 +++++++-- install-esxipower.sh | 9 +++++++-- install-filewatcher.sh | 9 +++++++-- install-linupx.sh | 9 +++++++-- install-mediamanager.sh | 9 +++++++-- install-nextcloud.ah | 9 +++++++-- install-pibackup.sh | 9 +++++++-- install-postfix.sh | 9 +++++++-- install-powerwall.sh | 9 +++++++-- install-unifi-poller | 9 +++++++-- install-vpnmon.sh | 9 +++++++-- setup-powerdns.sh | 9 +++++++-- uninstall-dsmon.sh | 9 +++++++-- uninstall-filewatcher.sh | 9 +++++++-- uninstall-linupx.sh | 9 +++++++-- uninstall-mysqlbu.sh | 9 +++++++-- vcenter-ssl-update.sh | 9 +++++++-- 20 files changed, 140 insertions(+), 41 deletions(-) diff --git a/add-linux-pass.sh b/add-linux-pass.sh index df2c667..e0584b3 100755 --- a/add-linux-pass.sh +++ b/add-linux-pass.sh @@ -1,7 +1,12 @@ #!/usr/bin/env bash -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo "" diff --git a/add-veeam-user.sh b/add-veeam-user.sh index b577d87..20ce555 100755 --- a/add-veeam-user.sh +++ b/add-veeam-user.sh @@ -1,7 +1,12 @@ #!/usr/bin/env bash -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo diff --git a/cc-cleaner.sh b/cc-cleaner.sh index 0081467..c49bb82 100755 --- a/cc-cleaner.sh +++ b/cc-cleaner.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" - +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo "" echo -e "${idsCL[LightGreen]}Cluster Control Removal Script${idsCL[Default]}" diff --git a/install-dsmon.sh b/install-dsmon.sh index 9d2412f..db7a291 100755 --- a/install-dsmon.sh +++ b/install-dsmon.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo "" diff --git a/install-esxipower.sh b/install-esxipower.sh index b700adf..df4e283 100755 --- a/install-esxipower.sh +++ b/install-esxipower.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" diff --git a/install-filewatcher.sh b/install-filewatcher.sh index 6ef4c33..b5cd07e 100755 --- a/install-filewatcher.sh +++ b/install-filewatcher.sh @@ -1,7 +1,12 @@ #!/usr/bin/env bash -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi if type apt &>/dev/null; then ATYPE="apt" diff --git a/install-linupx.sh b/install-linupx.sh index 94b8439..09cead9 100755 --- a/install-linupx.sh +++ b/install-linupx.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" diff --git a/install-mediamanager.sh b/install-mediamanager.sh index 28d6f2a..add9896 100755 --- a/install-mediamanager.sh +++ b/install-mediamanager.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo "" diff --git a/install-nextcloud.ah b/install-nextcloud.ah index c720923..6220fc9 100644 --- a/install-nextcloud.ah +++ b/install-nextcloud.ah @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo "" diff --git a/install-pibackup.sh b/install-pibackup.sh index 0283acd..e289406 100755 --- a/install-pibackup.sh +++ b/install-pibackup.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo "" diff --git a/install-postfix.sh b/install-postfix.sh index 4ee6c35..d1ab050 100755 --- a/install-postfix.sh +++ b/install-postfix.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo "" echo -e "${idsCL[LightGreen]}Postfix Installation Script for scity.us${idsCL[Default]}" diff --git a/install-powerwall.sh b/install-powerwall.sh index e9579a9..ceb3299 100755 --- a/install-powerwall.sh +++ b/install-powerwall.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" diff --git a/install-unifi-poller b/install-unifi-poller index 1165ea3..939d5f8 100644 --- a/install-unifi-poller +++ b/install-unifi-poller @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" diff --git a/install-vpnmon.sh b/install-vpnmon.sh index 30234f6..458828e 100755 --- a/install-vpnmon.sh +++ b/install-vpnmon.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo "" diff --git a/setup-powerdns.sh b/setup-powerdns.sh index 7548015..1f014e0 100755 --- a/setup-powerdns.sh +++ b/setup-powerdns.sh @@ -1,7 +1,12 @@ #!/bin/bash clear -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi echo echo -e "${idsCL[Yellow]}PowerDNS Master & Slave Setup${idsCL[Default]}" diff --git a/uninstall-dsmon.sh b/uninstall-dsmon.sh index 4aaf78c..9eb18c2 100755 --- a/uninstall-dsmon.sh +++ b/uninstall-dsmon.sh @@ -2,8 +2,13 @@ # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi #source /opt/idssys/defaults/colors.inc #source /opt/idssys/defaults/default.inc diff --git a/uninstall-filewatcher.sh b/uninstall-filewatcher.sh index 0496efb..371a774 100755 --- a/uninstall-filewatcher.sh +++ b/uninstall-filewatcher.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" diff --git a/uninstall-linupx.sh b/uninstall-linupx.sh index 3c00649..06a9161 100755 --- a/uninstall-linupx.sh +++ b/uninstall-linupx.sh @@ -2,8 +2,13 @@ # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi #source /opt/idssys/defaults/colors.inc #source /opt/idssys/defaults/default.inc diff --git a/uninstall-mysqlbu.sh b/uninstall-mysqlbu.sh index eee3202..5bac057 100755 --- a/uninstall-mysqlbu.sh +++ b/uninstall-mysqlbu.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}" diff --git a/vcenter-ssl-update.sh b/vcenter-ssl-update.sh index ee10115..cac45de 100755 --- a/vcenter-ssl-update.sh +++ b/vcenter-ssl-update.sh @@ -1,8 +1,13 @@ #!/usr/bin/env bash # Wrapper script for install, for easier execution via URL. -source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" -source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +if [ -d /opt/idssys/defaults ]; then + source /opt/idssys/defaults/colors.inc + source /opt/idssys/defaults/default.inc +else + source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)" + source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" +fi if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}"