diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..11ff04f Binary files /dev/null and b/.DS_Store differ 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