From fd98be8eb29d9febac8f599fcf41ecee0561ebb8 Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Tue, 12 Nov 2024 13:56:34 +0000 Subject: [PATCH 01/13] Removed old script --- ubiquiti_stock.sh | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 ubiquiti_stock.sh diff --git a/ubiquiti_stock.sh b/ubiquiti_stock.sh deleted file mode 100644 index 2e4917e..0000000 --- a/ubiquiti_stock.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -URL=${1} -EMAIL=${2} -NAME=${3} - -LOG_FILE="/tmp/Ubiquiti Stock ${NAME}.log" - -echo "" > "${LOG_FILE}" - -echo "URL: ${URL}" | tee -a "${LOG_FILE}" -echo "Email: ${EMAIL}" | tee -a "${LOG_FILE}" -echo "Name: ${NAME}" | tee -a "${LOG_FILE}" - -SOURCE_FILE="/tmp/Ubiquiti Stock ${NAME}.source" - -echo "Source File: ${SOURCE_FILE}" | tee -a "${LOG_FILE}" - -wget -qO "${SOURCE_FILE}" ${URL} - -INVENTORY_QUANTITY=$(grep -o -m 1 '"inventory_quantity":[0-9]\+,' "${SOURCE_FILE}" | grep -o '[0-9]\+') - -echo "Inventory Quantity: ${INVENTORY_QUANTITY}" | tee -a "${LOG_FILE}" - -if [[ "${INVENTORY_QUANTITY}" -gt "0" ]]; then - MESSAGE="There are currently ${INVENTORY_QUANTITY} ${NAME} in stock. ${URL}" - echo "Message: ${MESSAGE}" | tee -a "${LOG_FILE}" - echo "${MESSAGE}" | mailx -r "stockalerts@johnhgaunt.com" --set smtp="smtp.home.johnhgaunt.com:25" "${EMAIL}" - echo "Email sent" | tee -a "${LOG_FILE}" -else - echo "Not sending email" | tee -a "${LOG_FILE}" -fi \ No newline at end of file From 63a2fd5b9ac1e7d96a9a682f0d3a8d18478638bf Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Tue, 12 Nov 2024 14:02:01 +0000 Subject: [PATCH 02/13] Updated to make the server a parameter --- csr.ps1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/csr.ps1 b/csr.ps1 index a6829a3..f81c0d8 100644 --- a/csr.ps1 +++ b/csr.ps1 @@ -9,7 +9,8 @@ param( [string]$domain = "home.johnhgaunt.com", [System.IO.FileInfo]$Path = [Environment]::GetFolderPath("Desktop"), [ValidateSet("RSA2048", "RSA4096","ECC-256", "ECC-384")] - [string]$algorithm = "ECC-384" + [string]$algorithm = "ECC-384", + [string]$server = "gauntonlineca.home.johnhgaunt.com\GauntOnlineCA-CA" ) begin { @@ -89,7 +90,7 @@ DNS.2 = $hostname" -Wait Start-Process certreq.exe ` - -ArgumentList "-submit -config `"gauntonlineca.home.johnhgaunt.com\GauntOnlineCA-CA`" -attrib `"$certReqAttrib`" `"$csrFile`" `"$crtFile`"" ` + -ArgumentList "-submit -config `"$server`" -attrib `"$certReqAttrib`" `"$csrFile`" `"$crtFile`"" ` -Wait # add the sub CA to the end of the cert From 6232ea9d5183364d95236011243d58730cbc4c20 Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Thu, 14 Nov 2024 13:23:56 +0000 Subject: [PATCH 03/13] updated input wording --- domainjoin.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/domainjoin.sh b/domainjoin.sh index e19a33d..efbface 100644 --- a/domainjoin.sh +++ b/domainjoin.sh @@ -5,10 +5,10 @@ if [ "$EUID" -ne 0 ]; then exit fi # ask for the domain, username, and password -read -e -p "Enter Domain name: " -i "home.johnhgaunt.com" domain -read -e -p "Enter netBIOS name: " -i "GAUNT" netbiosname -read -e -p "Enter Domain Admin username: " -i "jgaunto" username -read -e -s -p "Enter Password: " password +read -e -p "Enter Domain Name: " -i "home.johnhgaunt.com" domain +read -e -p "Enter netBIOS Name: " -i "GAUNT" netbiosname +read -e -p "Enter Domain Admin Username: " -i "jgaunto" username +read -e -s -p "Enter ${USERNMAE}'s Password: " password # get OS ditro and version OS=$(hostnamectl | awk '/Operating System/ {print $3}') From 6500972c6bf3fced84b33aa4f69d8d1736b685f4 Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Thu, 14 Nov 2024 13:24:22 +0000 Subject: [PATCH 04/13] Updated to ask for input for server details instead of hard coded and arguments --- checkmk.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/checkmk.sh b/checkmk.sh index 582ce97..b5851e1 100644 --- a/checkmk.sh +++ b/checkmk.sh @@ -6,6 +6,13 @@ if [ "$EUID" -ne 0 ]; then exit fi +# ask for the domain, username, and password +read -e -p "Enter Checkmk Server: " -i "checkmk.johnhgaunt.com" CHECK_MK_SERVER +read -e -p "Enter Checkmk Site Name: " -i "gaunt" SITE_NAME +read -e -p "Enter Checkmk Username: " -i "automation" USERNMAE +read -e -s -p "Enter ${USERNMAE}'s Password: " PASSWORD + + # get OS ditro and version OS=$(hostnamectl | awk '/Operating System/ {print $3}') VM=$(hostnamectl | awk '/Virtualization/ {print $2}') @@ -24,11 +31,7 @@ fi set -e # set -x -CHECK_MK_SERVER="gauntcheckmk.home.johnhgaunt.com" -SITE_NAME="gaunt" API_URL="http://${CHECK_MK_SERVER}/${SITE_NAME}/check_mk/api/1.0" -USERNMAE="automation" -PASSWORD="$1" AUTHORIZATION_HEADER="Authorization: Bearer ${USERNMAE} ${PASSWORD}" read -e -p "Enter Hostname: " -i "$(cat /etc/hostname)" HOSTNAME @@ -40,7 +43,7 @@ if [ -x /usr/bin/dpkg ]; then if dpkg -l check-mk-agent > /dev/null; then dpkg -P check-mk-agent fi - apt-get install xinetd curl + apt-get install xinetd curl -y dpkg -i ${tmpfile} # Apt wget -O /usr/lib/check_mk_agent/plugins/mk_apt http://${CHECK_MK_SERVER}/${SITE_NAME}/check_mk/agents/plugins/mk_apt From 8800697cee25d3f15e4df807611707db1d3e97be Mon Sep 17 00:00:00 2001 From: jgaunt Date: Fri, 15 Nov 2024 16:48:30 +0000 Subject: [PATCH 05/13] Reverted to the hostname for the server instead of the top level domain --- checkmk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkmk.sh b/checkmk.sh index b5851e1..3dcc078 100644 --- a/checkmk.sh +++ b/checkmk.sh @@ -7,7 +7,7 @@ if [ "$EUID" -ne 0 ]; then fi # ask for the domain, username, and password -read -e -p "Enter Checkmk Server: " -i "checkmk.johnhgaunt.com" CHECK_MK_SERVER +read -e -p "Enter Checkmk Server: " -i "gauntcheckmk.home.johnhgaunt.com" CHECK_MK_SERVER read -e -p "Enter Checkmk Site Name: " -i "gaunt" SITE_NAME read -e -p "Enter Checkmk Username: " -i "automation" USERNMAE read -e -s -p "Enter ${USERNMAE}'s Password: " PASSWORD From 98cf16f1b6c5c0cb79a252ba6f0b711edbebf892 Mon Sep 17 00:00:00 2001 From: jgaunt Date: Fri, 15 Nov 2024 16:54:21 +0000 Subject: [PATCH 06/13] Updated to allow both regular domain and agent register domain --- checkmk.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checkmk.sh b/checkmk.sh index 3dcc078..8923a4c 100644 --- a/checkmk.sh +++ b/checkmk.sh @@ -7,7 +7,8 @@ if [ "$EUID" -ne 0 ]; then fi # ask for the domain, username, and password -read -e -p "Enter Checkmk Server: " -i "gauntcheckmk.home.johnhgaunt.com" CHECK_MK_SERVER +read -e -p "Enter Checkmk Server: " -i "checkmk.johnhgaunt.com" CHECK_MK_SERVER +read -e -p "Enter Checkmk Agent Server: " -i "gauntcheckmk.home.johnhgaunt.com" CHECK_MK_AGENT_SERVER read -e -p "Enter Checkmk Site Name: " -i "gaunt" SITE_NAME read -e -p "Enter Checkmk Username: " -i "automation" USERNMAE read -e -s -p "Enter ${USERNMAE}'s Password: " PASSWORD @@ -102,7 +103,7 @@ if [ "${VM}" == "false" ]; then fi /usr/bin/cmk-agent-ctl register --hostname ${HOSTNAME} \ - --server ${CHECK_MK_SERVER} --site ${SITE_NAME} \ + --server ${CHECK_MK_AGENT_SERVER} --site ${SITE_NAME} \ --user ${USERNMAE} --password ${PASSWORD} \ --trust-cert From 3c6b64a744e5801b4790f316ce7aec0527a77265 Mon Sep 17 00:00:00 2001 From: jgaunt Date: Fri, 15 Nov 2024 17:01:46 +0000 Subject: [PATCH 07/13] fixed mistype --- checkmk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkmk.sh b/checkmk.sh index 8923a4c..cf19c73 100644 --- a/checkmk.sh +++ b/checkmk.sh @@ -10,7 +10,7 @@ fi read -e -p "Enter Checkmk Server: " -i "checkmk.johnhgaunt.com" CHECK_MK_SERVER read -e -p "Enter Checkmk Agent Server: " -i "gauntcheckmk.home.johnhgaunt.com" CHECK_MK_AGENT_SERVER read -e -p "Enter Checkmk Site Name: " -i "gaunt" SITE_NAME -read -e -p "Enter Checkmk Username: " -i "automation" USERNMAE +read -e -p "Enter Checkmk Username: " -i "automation" USERNAME read -e -s -p "Enter ${USERNMAE}'s Password: " PASSWORD From 1e1a6b18e93cea73a14f48fde5e8e60699fce0b3 Mon Sep 17 00:00:00 2001 From: jgaunt Date: Fri, 15 Nov 2024 17:04:27 +0000 Subject: [PATCH 08/13] removed agent url and fixed username variable --- checkmk.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checkmk.sh b/checkmk.sh index cf19c73..17946d8 100644 --- a/checkmk.sh +++ b/checkmk.sh @@ -7,11 +7,10 @@ if [ "$EUID" -ne 0 ]; then fi # ask for the domain, username, and password -read -e -p "Enter Checkmk Server: " -i "checkmk.johnhgaunt.com" CHECK_MK_SERVER -read -e -p "Enter Checkmk Agent Server: " -i "gauntcheckmk.home.johnhgaunt.com" CHECK_MK_AGENT_SERVER +read -e -p "Enter Checkmk Server: " -i "gauntcheckmk.home.johnhgaunt.com" CHECK_MK_SERVER read -e -p "Enter Checkmk Site Name: " -i "gaunt" SITE_NAME read -e -p "Enter Checkmk Username: " -i "automation" USERNAME -read -e -s -p "Enter ${USERNMAE}'s Password: " PASSWORD +read -e -s -p "Enter ${USERNAME}'s Password: " PASSWORD # get OS ditro and version @@ -33,7 +32,7 @@ set -e # set -x API_URL="http://${CHECK_MK_SERVER}/${SITE_NAME}/check_mk/api/1.0" -AUTHORIZATION_HEADER="Authorization: Bearer ${USERNMAE} ${PASSWORD}" +AUTHORIZATION_HEADER="Authorization: Bearer ${USERNAME} ${PASSWORD}" read -e -p "Enter Hostname: " -i "$(cat /etc/hostname)" HOSTNAME tmpdir=$(mktemp -d) @@ -103,8 +102,8 @@ if [ "${VM}" == "false" ]; then fi /usr/bin/cmk-agent-ctl register --hostname ${HOSTNAME} \ - --server ${CHECK_MK_AGENT_SERVER} --site ${SITE_NAME} \ - --user ${USERNMAE} --password ${PASSWORD} \ + --server ${CHECK_MK_SERVER} --site ${SITE_NAME} \ + --user ${USERNAME} --password ${PASSWORD} \ --trust-cert sleep 15s From c43d1cd14212969a918d58e7b1fde21afbb91ea0 Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Mon, 18 Nov 2024 11:53:41 -0500 Subject: [PATCH 09/13] Updated mounts to be read only --- backupBSD.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backupBSD.sh b/backupBSD.sh index 31c7935..64760bc 100644 --- a/backupBSD.sh +++ b/backupBSD.sh @@ -20,7 +20,7 @@ GauntRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/mkdir ${GauntRouterSSHFSMountDirectory} && \ /usr/bin/echo ${GauntRouter01EncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ - /usr/bin/sshfs -o password_stdin root@${DNSName}:/ ${GauntRouterSSHFSMountDirectory} && \ + /usr/bin/sshfs -o password_stdin -o ro root@${DNSName}:/ ${GauntRouterSSHFSMountDirectory} && \ /usr/bin/proxmox-backup-client backup conf.pxar:${GauntRouterSSHFSMountDirectory}/conf bpsensei.pxar:${GauntRouterSSHFSMountDirectory}/usr/local/bpsensei --backup-id GauntRouter01 --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory /usr/bin/umount --force --lazy --quiet ${GauntRouterSSHFSMountDirectory} && \ @@ -32,7 +32,7 @@ TheGauntsRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/mkdir ${TheGauntsRouterSSHFSMountDirectory} && \ /usr/bin/echo ${TheGauntsRouterEncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ - /usr/bin/sshfs -o password_stdin root@${DNSName}:/ ${TheGauntsRouterSSHFSMountDirectory} && \ + /usr/bin/sshfs -o password_stdin -o ro root@${DNSName}:/ ${TheGauntsRouterSSHFSMountDirectory} && \ /usr/bin/proxmox-backup-client backup conf.pxar:${TheGauntsRouterSSHFSMountDirectory}/conf bpsensei.pxar:${TheGauntsRouterSSHFSMountDirectory}/usr/local/bpsensei --backup-id TheGauntsRouter --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory @@ -45,7 +45,7 @@ GauntNASSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/mkdir ${GauntNASSSHFSMountDirectory} && \ /usr/bin/echo ${GauntNASEncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ - /usr/bin/sshfs -o password_stdin root@${DNSName}:/ ${GauntNASSSHFSMountDirectory} && \ + /usr/bin/sshfs -o password_stdin -o ro root@${DNSName}:/ ${GauntNASSSHFSMountDirectory} && \ /usr/bin/proxmox-backup-client backup data.pxar:${GauntNASSSHFSMountDirectory}/data etc.pxar:${GauntNASSSHFSMountDirectory}/etc root.pxar:${GauntNASSSHFSMountDirectory}/root --backup-id GauntNAS --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory From 4075df435fd103bf60b6ad04401ed9e4d3ba0334 Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Mon, 18 Nov 2024 12:03:21 -0500 Subject: [PATCH 10/13] fixed typo for multiline --- backupBSD.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backupBSD.sh b/backupBSD.sh index 64760bc..1d3bfcc 100644 --- a/backupBSD.sh +++ b/backupBSD.sh @@ -33,8 +33,7 @@ TheGauntsRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/echo ${TheGauntsRouterEncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ /usr/bin/sshfs -o password_stdin -o ro root@${DNSName}:/ ${TheGauntsRouterSSHFSMountDirectory} && \ - /usr/bin/proxmox-backup-client backup conf.pxar:${TheGauntsRouterSSHFSMountDirectory}/conf bpsensei.pxar:${TheGauntsRouterSSHFSMountDirectory}/usr/local/bpsensei --backup-id -TheGauntsRouter --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local + /usr/bin/proxmox-backup-client backup conf.pxar:${TheGauntsRouterSSHFSMountDirectory}/conf bpsensei.pxar:${TheGauntsRouterSSHFSMountDirectory}/usr/local/bpsensei --backup-id TheGauntsRouter --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory /usr/bin/umount --force --lazy --quiet ${TheGauntsRouterSSHFSMountDirectory} && \ /usr/bin/rmdir ${TheGauntsRouterSSHFSMountDirectory} @@ -46,8 +45,7 @@ GauntNASSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/echo ${GauntNASEncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ /usr/bin/sshfs -o password_stdin -o ro root@${DNSName}:/ ${GauntNASSSHFSMountDirectory} && \ - /usr/bin/proxmox-backup-client backup data.pxar:${GauntNASSSHFSMountDirectory}/data etc.pxar:${GauntNASSSHFSMountDirectory}/etc root.pxar:${GauntNASSSHFSMountDirectory}/root ---backup-id GauntNAS --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local + /usr/bin/proxmox-backup-client backup data.pxar:${GauntNASSSHFSMountDirectory}/data etc.pxar:${GauntNASSSHFSMountDirectory}/etc root.pxar:${GauntNASSSHFSMountDirectory}/root --backup-id GauntNAS --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory /usr/bin/umount --force --lazy --quiet ${GauntNASSSHFSMountDirectory} && \ /usr/bin/rmdir ${GauntNASSSHFSMountDirectory} \ No newline at end of file From 902d2ce235031936ead03a2881d59bcab08b15b5 Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Mon, 18 Nov 2024 12:05:06 -0500 Subject: [PATCH 11/13] added line breaks to make it easier to read --- backupBSD.sh | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/backupBSD.sh b/backupBSD.sh index 1d3bfcc..0b3a043 100644 --- a/backupBSD.sh +++ b/backupBSD.sh @@ -20,8 +20,14 @@ GauntRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/mkdir ${GauntRouterSSHFSMountDirectory} && \ /usr/bin/echo ${GauntRouter01EncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ - /usr/bin/sshfs -o password_stdin -o ro root@${DNSName}:/ ${GauntRouterSSHFSMountDirectory} && \ - /usr/bin/proxmox-backup-client backup conf.pxar:${GauntRouterSSHFSMountDirectory}/conf bpsensei.pxar:${GauntRouterSSHFSMountDirectory}/usr/local/bpsensei --backup-id GauntRouter01 --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local + /usr/bin/sshfs -o password_stdin -o ro \ + root@${DNSName}:/ ${GauntRouterSSHFSMountDirectory} && \ + /usr/bin/proxmox-backup-client backup \ + conf.pxar:${GauntRouterSSHFSMountDirectory}/conf \ + bpsensei.pxar:${GauntRouterSSHFSMountDirectory}/usr/local/bpsensei \ + --backup-id GauntRouter01 \ + --ns Hosts \ + --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory /usr/bin/umount --force --lazy --quiet ${GauntRouterSSHFSMountDirectory} && \ /usr/bin/rmdir ${GauntRouterSSHFSMountDirectory} @@ -32,8 +38,14 @@ TheGauntsRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/mkdir ${TheGauntsRouterSSHFSMountDirectory} && \ /usr/bin/echo ${TheGauntsRouterEncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ - /usr/bin/sshfs -o password_stdin -o ro root@${DNSName}:/ ${TheGauntsRouterSSHFSMountDirectory} && \ - /usr/bin/proxmox-backup-client backup conf.pxar:${TheGauntsRouterSSHFSMountDirectory}/conf bpsensei.pxar:${TheGauntsRouterSSHFSMountDirectory}/usr/local/bpsensei --backup-id TheGauntsRouter --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local + /usr/bin/sshfs -o password_stdin -o ro \ + root@${DNSName}:/ ${TheGauntsRouterSSHFSMountDirectory} && \ + /usr/bin/proxmox-backup-client backup \ + conf.pxar:${TheGauntsRouterSSHFSMountDirectory}/conf \ + bpsensei.pxar:${TheGauntsRouterSSHFSMountDirectory}/usr/local/bpsensei \ + --backup-id TheGauntsRouter \ + --ns Hosts \ + --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory /usr/bin/umount --force --lazy --quiet ${TheGauntsRouterSSHFSMountDirectory} && \ /usr/bin/rmdir ${TheGauntsRouterSSHFSMountDirectory} @@ -44,8 +56,15 @@ GauntNASSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/mkdir ${GauntNASSSHFSMountDirectory} && \ /usr/bin/echo ${GauntNASEncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ - /usr/bin/sshfs -o password_stdin -o ro root@${DNSName}:/ ${GauntNASSSHFSMountDirectory} && \ - /usr/bin/proxmox-backup-client backup data.pxar:${GauntNASSSHFSMountDirectory}/data etc.pxar:${GauntNASSSHFSMountDirectory}/etc root.pxar:${GauntNASSSHFSMountDirectory}/root --backup-id GauntNAS --ns Hosts --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local + /usr/bin/sshfs -o password_stdin -o ro \ + root@${DNSName}:/ ${GauntNASSSHFSMountDirectory} && \ + /usr/bin/proxmox-backup-client backup \ + data.pxar:${GauntNASSSHFSMountDirectory}/data \ + etc.pxar:${GauntNASSSHFSMountDirectory}/etc \ + root.pxar:${GauntNASSSHFSMountDirectory}/root \ + --backup-id GauntNAS \ + --ns Hosts \ + --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory /usr/bin/umount --force --lazy --quiet ${GauntNASSSHFSMountDirectory} && \ /usr/bin/rmdir ${GauntNASSSHFSMountDirectory} \ No newline at end of file From d7b1a675974a1e71564ce07a62839ae81d5f604e Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Mon, 18 Nov 2024 12:07:02 -0500 Subject: [PATCH 12/13] updated new IP address for thegauntsrouter --- backupBSD.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backupBSD.sh b/backupBSD.sh index 0b3a043..7fe32d6 100644 --- a/backupBSD.sh +++ b/backupBSD.sh @@ -33,7 +33,7 @@ GauntRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/rmdir ${GauntRouterSSHFSMountDirectory} # Backup TheGauntsRouter -DNSName="172.21.0.6" +DNSName="10.1.4.2" TheGauntsRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" /usr/bin/mkdir ${TheGauntsRouterSSHFSMountDirectory} && \ /usr/bin/echo ${TheGauntsRouterEncryptedRootPassword} | \ From b5c536d750c5c70f6409a2a0bf18646170454c9c Mon Sep 17 00:00:00 2001 From: John Gaunt Date: Mon, 18 Nov 2024 12:22:58 -0500 Subject: [PATCH 13/13] added verbose calls --- backupBSD.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/backupBSD.sh b/backupBSD.sh index 7fe32d6..66ee53e 100644 --- a/backupBSD.sh +++ b/backupBSD.sh @@ -17,7 +17,7 @@ fi # Backup GauntRouter01 DNSName="gauntrouter01.home.johnhgaunt.com" GauntRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" -/usr/bin/mkdir ${GauntRouterSSHFSMountDirectory} && \ +/usr/bin/mkdir -v ${GauntRouterSSHFSMountDirectory} && \ /usr/bin/echo ${GauntRouter01EncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ /usr/bin/sshfs -o password_stdin -o ro \ @@ -29,13 +29,13 @@ GauntRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" --ns Hosts \ --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory -/usr/bin/umount --force --lazy --quiet ${GauntRouterSSHFSMountDirectory} && \ - /usr/bin/rmdir ${GauntRouterSSHFSMountDirectory} +/usr/bin/umount -v --force --lazy --quiet ${GauntRouterSSHFSMountDirectory} && \ + /usr/bin/rmdir -v ${GauntRouterSSHFSMountDirectory} # Backup TheGauntsRouter DNSName="10.1.4.2" TheGauntsRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" -/usr/bin/mkdir ${TheGauntsRouterSSHFSMountDirectory} && \ +/usr/bin/mkdir -v ${TheGauntsRouterSSHFSMountDirectory} && \ /usr/bin/echo ${TheGauntsRouterEncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ /usr/bin/sshfs -o password_stdin -o ro \ @@ -47,13 +47,13 @@ TheGauntsRouterSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" --ns Hosts \ --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory -/usr/bin/umount --force --lazy --quiet ${TheGauntsRouterSSHFSMountDirectory} && \ - /usr/bin/rmdir ${TheGauntsRouterSSHFSMountDirectory} +/usr/bin/umount -v --force --lazy --quiet ${TheGauntsRouterSSHFSMountDirectory} && \ + /usr/bin/rmdir -v ${TheGauntsRouterSSHFSMountDirectory} # Backup GauntNAS DNSName="gauntnas.home.johnhgaunt.com" GauntNASSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" -/usr/bin/mkdir ${GauntNASSSHFSMountDirectory} && \ +/usr/bin/mkdir -v ${GauntNASSSHFSMountDirectory} && \ /usr/bin/echo ${GauntNASEncryptedRootPassword} | \ /usr/bin/clevis decrypt | \ /usr/bin/sshfs -o password_stdin -o ro \ @@ -66,5 +66,5 @@ GauntNASSSHFSMountDirectory="${SSHFSMountDirectory}/${DNSName}" --ns Hosts \ --repository GauntPBS01-Helper@pbs@gauntpbs01.home.johnhgaunt.com:8007:GauntPBS01-Local # umount and remove directory -/usr/bin/umount --force --lazy --quiet ${GauntNASSSHFSMountDirectory} && \ - /usr/bin/rmdir ${GauntNASSSHFSMountDirectory} \ No newline at end of file +/usr/bin/umount -v --force --lazy --quiet ${GauntNASSSHFSMountDirectory} && \ + /usr/bin/rmdir -v ${GauntNASSSHFSMountDirectory} \ No newline at end of file