From 25da6903ab13c59e0b0559a819fcc1d42bfe0127 Mon Sep 17 00:00:00 2001
From: mathwhiz1212 <mathwhiz1212@users.noreply.github.com>
Date: Sun, 6 Apr 2025 17:48:15 -0600
Subject: [PATCH] Move scripts into folders and update links accordingly - set
 variable to do so.

---
 .DS_Store                                        | Bin 0 -> 6148 bytes
 complete-setup.sh => Proxmox/complete-setup.sh   |   0
 proxmox-setup.sh => Proxmox/proxmox-setup.sh     |   0
 vm-setup.sh => Proxmox/vm-setup.sh               |   0
 VERSION => dss/VERSION                           |   0
 create-user.bash => dss/create-user.bash         |   0
 .../determined-server-setup.sh                   |   7 ++++---
 harden-server.sh => dss/harden-server.sh         |   7 ++++---
 sysmon.sh => dss/sysmon.sh                       |   3 ++-
 9 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 .DS_Store
 rename complete-setup.sh => Proxmox/complete-setup.sh (100%)
 rename proxmox-setup.sh => Proxmox/proxmox-setup.sh (100%)
 rename vm-setup.sh => Proxmox/vm-setup.sh (100%)
 rename VERSION => dss/VERSION (100%)
 rename create-user.bash => dss/create-user.bash (100%)
 rename determined-server-setup.sh => dss/determined-server-setup.sh (93%)
 rename harden-server.sh => dss/harden-server.sh (93%)
 rename sysmon.sh => dss/sysmon.sh (96%)

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..11ff04f428c5804efb403cad47cfa4a6ecbb037b
GIT binary patch
literal 6148
zcmeHKy-piJ5T3;bulbQ&1j*$|v`E-MBB3-FWBQ0gPyjN%oCT-c-C907j$~Q78s32_
z50NG%^fbH*QmV}C4#N1aj3Tll&3v;vGkf0ebh{n^5Vc-V1t<Z4L?z5GqnRQUC!LT5
zo>@f{v_{(YBjw}hr{A8)wiA{C%fP?J0DZeT2q1;j?~i`JQJ8isl}E9V%P%e!WI?XT
zbMH#^y>7GHOKZ)}DUFVliu`B4=^ux!exvkmUnSjUn6x^&APicVa&{6Xf$G;(F9}jz
z>zRNo%3`Bb9t^70y-jEL{qAtn8SHIW(BJtm92VvJ#@5Hf#@8rL)U}~c;Ax{}jqw?7
z(Ba)gmsRhJibu~Oj>M{7=W|MypYGOvJlubJsf$%GC)&Q6wdyyolSC@H#FgmR72q>;
zK*4v2$-WV8$96S^<FSlUu7Cf!U1F{$vR*i!oi&B~v317Y0lo$+a~R;SNUqGuu_4QV
zW#Ip0fX)X8mC$9(4C<o;jcx%D^Ej;qed;Bs#$j|BGlLjG5vCN;lnQP!gek{)hx1&<
z%%CX;!Oe%@CkyUSgnl}%@91<8u0d-p1D1i;4CKtPMEC!}?Ee3CksVnEECX+f0g<nJ
z^%`!8@79UU(Ov7HUZ9dtUS?32pyBISJ9HJ7QMF*qAqUZA%nafTiv1&?X|TpJ@K+i5
E17{M%bpQYW

literal 0
HcmV?d00001

diff --git a/complete-setup.sh b/Proxmox/complete-setup.sh
similarity index 100%
rename from complete-setup.sh
rename to Proxmox/complete-setup.sh
diff --git a/proxmox-setup.sh b/Proxmox/proxmox-setup.sh
similarity index 100%
rename from proxmox-setup.sh
rename to Proxmox/proxmox-setup.sh
diff --git a/vm-setup.sh b/Proxmox/vm-setup.sh
similarity index 100%
rename from vm-setup.sh
rename to Proxmox/vm-setup.sh
diff --git a/VERSION b/dss/VERSION
similarity index 100%
rename from VERSION
rename to dss/VERSION
diff --git a/create-user.bash b/dss/create-user.bash
similarity index 100%
rename from create-user.bash
rename to dss/create-user.bash
diff --git a/determined-server-setup.sh b/dss/determined-server-setup.sh
similarity index 93%
rename from determined-server-setup.sh
rename to dss/determined-server-setup.sh
index c433ec6..05762d5 100755
--- a/determined-server-setup.sh
+++ b/dss/determined-server-setup.sh
@@ -3,7 +3,8 @@
 # Written by Josh Mudge
 # Ad Mejorem Dei Glorium
 
-version=$(curl -s https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/VERSION | cat)
+DSSSOURCE=https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/dss/
+version=$(curl -s $DSSSOURCE/VERSION | cat)
 
 # Get options from CLI arguments
 
@@ -148,7 +149,7 @@ then
   # Update Linux and determined-setup
   sudo apt-get update
   sudo apt-get upgrade
-  curl -s "https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/setup.sh" | bash
+  curl -s "$DSSSOURCE/setup.sh" | bash
 
 elif test $clean = 1
 then
@@ -170,7 +171,7 @@ elif test $mon = 2
 then
 
   dss init
-  curl -sO "https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/sysmon.sh"
+  curl -sO "$DSSSOURCE/sysmon.sh"
   sudo mv sysmon.sh /home/.sysmon.sh
  ( sudo crontab -l ; echo "14 1 * * * /bin/bash -c "/home/.sysmon.sh --email $email"" &> "$logfile" ) | sudo crontab -
 
diff --git a/harden-server.sh b/dss/harden-server.sh
similarity index 93%
rename from harden-server.sh
rename to dss/harden-server.sh
index c995440..33eb786 100644
--- a/harden-server.sh
+++ b/dss/harden-server.sh
@@ -5,9 +5,10 @@
 
 # Only ban password login for root, not all login for root.
 
+DSSSOURCE=https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/dss/
 usr=$USER
-version="v1.4.4 Alpha"
-keyserver="https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/"
+version="v1.4.5 Alpha"
+keyserver="$DSSSOURCE"
 
 while [[ $# -gt 0 ]]
 do
@@ -79,7 +80,7 @@ then
 
   cd .tssh
 
-  curl -sLO https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/create-user.bash
+  curl -sLO $DSSSOURCE/create-user.bash
 
   curl -sLO https://$keyserver/$usr.pub
 
diff --git a/sysmon.sh b/dss/sysmon.sh
similarity index 96%
rename from sysmon.sh
rename to dss/sysmon.sh
index fd1ffdb..0c0ea44 100644
--- a/sysmon.sh
+++ b/dss/sysmon.sh
@@ -3,6 +3,7 @@
 # Written by Josh Mudge
 # Ad Mejorem Dei Glorium
 
+DSSSOURCE=https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/dss/
 update=1
 version=v1.5.3a
 alpha=0
@@ -60,7 +61,7 @@ then
   sudo apt-get update
   sudo apt-get upgrade
   sudo apt-get install sysstat # Check if installed, then do this
-  curl -s "https://git.coolaj86.com/josh/proxmox-scripts/raw/branch/main/setup.sh" | bash
+  curl -s "$DSSSOURCE/setup.sh" | bash
 
 fi