From 3fd1874efcd3423e42b38465f10b6f3da560a166 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 27 Jan 2019 15:29:53 -0600
Subject: [PATCH] folder change

---
 install-linupx.sh   | 12 ++++++++----
 install-mysqlbu.sh  | 18 ++++--------------
 install-nodemgmt.sh | 13 ++++++++-----
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/install-linupx.sh b/install-linupx.sh
index f23ddbe..c98dede 100755
--- a/install-linupx.sh
+++ b/install-linupx.sh
@@ -14,11 +14,15 @@ echo -e "${CS[color,LightGreen]}LinUPx Installation Script${CS[color,Default]}"
 do_with_root $APTFUNC -y install wget curl git
 
 do_with_root set -eu
-# $PREFIX git -c http.sslVerify=false clone https://git.schroedercity.com/voltron/LinUPx.git /opt/LinUPx
-do_with_root git clone https://git.schroedercity.com/voltron/LinUPx.git /opt/LinUPx
-do_with_root ln -s /opt/LinUPx/run.sh /usr/local/bin/runup
+do_with_root git clone https://git.schroedercity.com/voltron/LinUPx.git /opt/idssys/LinUPx
+do_with_root ln -s /opt/idssys/LinUPx/run.sh /usr/local/bin/runup
 echo -e "useAutoremove=1
-opennms=false" > /opt/LinUPx/settings.conf
+opennms=false" > /opt/idssys/LinUPx/settings.conf
+
+if [ ! -d "/opt/idssys/defaults" ]; then
+	do_with_root set -eu
+	do_with_root git clone gogs@git.schroedercity.com:voltron/iDS-Defaults.git /opt/idssys/defaults
+fi
 
 
 echo ""
diff --git a/install-mysqlbu.sh b/install-mysqlbu.sh
index 6bb2286..fc99f8a 100755
--- a/install-mysqlbu.sh
+++ b/install-mysqlbu.sh
@@ -3,17 +3,7 @@
 
 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)"
-	
-if type apt &>/dev/null; then
-	ATYPE="apt"
-elif type apt-get &>/dev/null; then
-	ATYPE="apt-get"
-elif type yum &>/dev/null; then
-	ATYPE="yum"
-else
-	ATYPE="unknown"
-	exit 1
-fi
+
 
 if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}"
 else APTFUNC="${ATYPE}"
@@ -29,14 +19,14 @@ do_with_root $APTFUNC update
 do_with_root $APTFUNC -y install wget curl git percona-xtrabackup-24
 
 do_with_root set -eu
-do_with_root git clone https://git.schroedercity.com/voltron/MySQL-BU.git /opt/mysqlbu
-do_with_root ln -s /opt/mysqlbu/run.sh /usr/local/bin/mysqlbu
+do_with_root git clone https://git.schroedercity.com/voltron/MySQL-BU.git /opt/idssys/mysqlbu
+do_with_root ln -s /opt/idssys/mysqlbu/run.sh /usr/local/bin/mysqlbu
 echo -e "BACKUP_PATH='/var/lib/mysql-backups/'
 MYSQLUSER='root'
 MYSQLPASS='Dc\$@54115'
 MYSQLCFG='/etc/mysql/my.cnf'
 BACKUPSTOKEEP=3
-" > /opt/mysqlbu/settings.conf
+" > /opt/idssys/mysqlbu/settings.conf
 
 
 echo ""
diff --git a/install-nodemgmt.sh b/install-nodemgmt.sh
index 3c87640..fb9e5bc 100755
--- a/install-nodemgmt.sh
+++ b/install-nodemgmt.sh
@@ -14,12 +14,15 @@ echo -e "${CS[color,LightGreen]}NodeMgmt Installation Script${CS[color,Default]}
 do_with_root $APTFUNC -y install wget curl git
 
 do_with_root set -eu
-do_with_root git clone --recurse-submodules gogs@git.schroedercity.com:voltron/NodeMgmt.git /opt/nodemgmt
-do_with_root ln -s /opt/nodemgmt/run.sh /usr/local/bin/nodemgmt
+do_with_root git clone gogs@git.schroedercity.com:voltron/NodeMgmt.git /opt/idssys/nodemgmt
+do_with_root ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nodemgmt
 
-cd /opt/nodemgmt
-do_with_root git submodule foreach git pull origin master
-echo -e "node_hostname=$(hostname)" > /opt/nodemgmt/settings.conf
+if [ ! -d "/opt/idssys/defaults" ]; then
+	do_with_root set -eu
+	do_with_root git clone gogs@git.schroedercity.com:voltron/iDS-Defaults.git /opt/idssys/defaults
+fi
+
+echo -e "node_hostname=$(hostname)" > /opt/idssys/nodemgmt/settings.conf
 
 
 echo ""