From 33b6b53008dbb1af5f59abd41c0066cf7851746c Mon Sep 17 00:00:00 2001
From: Ruben <sneexy@disroot.org>
Date: Thu, 17 Jul 2025 00:10:38 -0500
Subject: [PATCH] minor script tweaks

---
 helperbot | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/helperbot b/helperbot
index 7bc2828..a25e6a1 100755
--- a/helperbot
+++ b/helperbot
@@ -376,9 +376,9 @@ function system_backup {
         # =============================================================================
         # pull in any other common configs and secrets
         echo "${blue}Pulling in other configurations...${normal}"
-        mkdir -p $backup_working_directory/other/etc/caddy
+        mkdir -p $backup_working_directory/caddy
         mkdir -p $backup_working_directory/other/etc/secrets
-        cp /etc/caddy/Caddyfile $backup_working_directory/other/etc/caddy/Caddyfile
+        cp -r $backup_local_folder/caddy $backup_working_directory/caddy
         cp -r /etc/secrets/* $backup_working_directory/other/etc/secrets/
         # =============================================================================
         # archive and compress everything
@@ -394,10 +394,6 @@ function system_backup {
         # cleanup
         echo "${blue}Cleaning up...${normal}"
         rm -fr ${backup_working_directory}/${backup_output_tar}.zst $backup_working_directory/*
-        # =============================================================================
-        # unload secrets - we already unload them for each vacuum/upload step, but we want to ensure they are
-        unset $(grep -v '^#' /etc/secrets/b2.env | sed -E 's/(.*)=.*/\1/' | xargs)
-        unset $(grep -v '^#' /etc/secrets/postgres.env | sed -E 's/(.*)=.*/\1/' | xargs)
     elif [ "$synth_current_system" = "neptunium" ]; then # neptunium
         # variables - could probably be set locally but unsure how much this will dynamically change between systems
         backup_local_folder=/srv/docker
@@ -516,10 +512,6 @@ function system_backup {
         # cleanup
         echo "${blue}Cleaning up...${normal}"
         rm -fr ${backup_working_directory}/${backup_output_tar}.zst $backup_working_directory/*
-        # =============================================================================
-        # unload secrets - we already unload them for each vacuum/upload step, but we want to ensure they are
-        unset $(grep -v '^#' /etc/secrets/b2.env | sed -E 's/(.*)=.*/\1/' | xargs)
-        unset $(grep -v '^#' /etc/secrets/postgres.env | sed -E 's/(.*)=.*/\1/' | xargs)
     elif [ "$synth_current_system" = "cerium" ]; then # cerium
         postgres_vacuum_self
     elif [ "$synth_current_system" = "synthnix" ]; then # synthnix