From c1f650344cfb308c7f390216ca1fec57878e0a77 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 29 Jan 2019 11:19:23 -0600
Subject: [PATCH] update

---
 .DS_Store           | Bin 0 -> 6148 bytes
 install-linupx.sh   |  10 +++++-----
 install-mysqlbu.sh  |  27 ++++++++++++++++-----------
 install-nodemgmt.sh |  10 +++++-----
 4 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/install-linupx.sh b/install-linupx.sh
index 8891d34..70d5b22 100755
--- a/install-linupx.sh
+++ b/install-linupx.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 # Wrapper script for install, for easier execution via URL.
 
-source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/colors.inc)"
-source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/default.inc)"
+source /dev/stdin <<< "$(curl -sL http://scity.xyz/colorsinc)"
+source /dev/stdin <<< "$(curl -sL http://scity.xyz/defaultinc)"
 
 
 if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}"
 else APTFUNC="${ATYPE}"
 fi
 echo ""
-echo -e "${CS[color,LightGreen]}LinUPx Installation Script${CS[color,Default]}"
+echo -e "${idsCL[LightGreen]}LinUPx Installation Script${idsCL[Default]}"
 
 do_with_root $APTFUNC -y install wget curl git
 
@@ -26,9 +26,9 @@ echo -e "useAutoremove=1
 opennms=false" > /opt/idssys/LinUPx/settings.conf
 
 echo ""
-echo -e "${CS[color,LightYellow]}LinUPx has been Installed${CS[color,Default]}"
+echo -e "${idsCL[Yellow]}LinUPx has been Installed${idsCL[Default]}"
 echo ""
-echo -e "To run updates, use the command: ${CS[color,Green]}runup${CS[color,Default]}"
+echo -e "To run updates, use the command: ${idsCL[Green]}runup${idsCL[Default]}"
 echo ""
 echo ""
 
diff --git a/install-mysqlbu.sh b/install-mysqlbu.sh
index fc99f8a..0d37422 100755
--- a/install-mysqlbu.sh
+++ b/install-mysqlbu.sh
@@ -1,22 +1,22 @@
 #!/usr/bin/env bash
 # Wrapper script for install, for easier execution via URL.
 
-source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/colors.inc)"
-source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/default.inc)"
+source /dev/stdin <<< "$(curl -sL http://scity.xyz/colorsinc)"
+source /dev/stdin <<< "$(curl -sL http://scity.xyz/defaultinc)"
 
 
 if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}"
 else APTFUNC="${ATYPE}"
 fi
 echo ""
-echo -e "${CS[color,LightGreen]}MySQL-BU Installation Script${CS[color,Default]}"
+echo -e "${idsCL[LightGreen]}MySQL-BU Installation Script${idsCL[Default]}"
 
-cd /tmp
-wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-do_with_root dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-do_with_root percona-release enable-only tools release
-do_with_root $APTFUNC update
-do_with_root $APTFUNC -y install wget curl git percona-xtrabackup-24
+#cd /tmp
+#wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
+#do_with_root dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+#do_with_root percona-release enable-only tools release
+#do_with_root $APTFUNC update
+do_with_root $APTFUNC -y install wget curl git mariadb-backup
 
 do_with_root set -eu
 do_with_root git clone https://git.schroedercity.com/voltron/MySQL-BU.git /opt/idssys/mysqlbu
@@ -28,11 +28,16 @@ MYSQLCFG='/etc/mysql/my.cnf'
 BACKUPSTOKEEP=3
 " > /opt/idssys/mysqlbu/settings.conf
 
+if [ ! -d "/opt/idssys/defaults" ]; then
+	do_with_root set -eu
+	do_with_root git clone https://git.schroedercity.com:voltron/iDS-Defaults.git /opt/idssys/defaults
+fi
+
 
 echo ""
-echo -e "${CS[color,LightYellow]}MySQL-BU has been Installed${CS[color,Default]}"
+echo -e "${idsCL[Yellow]}MySQL-BU has been Installed${idsCL[Default]}"
 echo ""
-echo -e "To run backups, use the command: ${CS[color,Green]}mysqlbu${CS[color,Default]}"
+echo -e "To run backups, use the command: ${idsCL[Green]}mysqlbu${idsCL[Default]}"
 echo ""
 echo ""
 
diff --git a/install-nodemgmt.sh b/install-nodemgmt.sh
index 7610616..d1dd99c 100755
--- a/install-nodemgmt.sh
+++ b/install-nodemgmt.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 # Wrapper script for install, for easier execution via URL.
 
-source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/colors.inc)"
-source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/default.inc)"
+source /dev/stdin <<< "$(curl -sL http://scity.xyz/colorsinc)"
+source /dev/stdin <<< "$(curl -sL http://scity.xyz/defaultinc)"
 
 
 if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}"
 else APTFUNC="${ATYPE}"
 fi
 echo ""
-echo -e "${CS[color,LightGreen]}NodeMgmt Installation Script${CS[color,Default]}"
+echo -e "${idsCL[LightGreen]}NodeMgmt Installation Script${idsCL[Default]}"
 
 do_with_root $APTFUNC -y install wget curl git
 
@@ -26,9 +26,9 @@ echo -e "node_hostname=$(hostname)" > /opt/idssys/nodemgmt/settings.conf
 
 
 echo ""
-echo -e "${CS[color,LightYellow]}NodeMgmt has been Installed${CS[color,Default]}"
+echo -e "${idsCL[Yellow]}NodeMgmt has been Installed${idsCL[Default]}"
 echo ""
-echo -e "To run, use the command: ${CS[color,Green]}nodemgmt${CS[color,Default]}"
+echo -e "To run, use the command: ${idsCL[Green]}nodemgmt${CS${idsCL[Default]}}"
 echo ""
 echo ""