From 68fce5f1b3020489e1fd1538e2d542b07ea62fb0 Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Mon, 23 Mar 2026 15:38:08 +0100 Subject: [PATCH] fix: second round audit - backup paths, cleanup, dead code CT scripts: - ct/hoodik.sh: backup to /opt instead of /tmp - ct/pixelfed.sh: backup to /opt, add CLEAN_INSTALL=1 - ct/skylite-ux.sh: backup to /opt instead of /tmp Install scripts: - install/alpine-install.sh: add missing cleanup_lxc - install/ubuntu-install.sh: replace manual apt-get cleanup with cleanup_lxc - install/debian-install.sh: apt-get -> apt - install/hoodik-install.sh: remove 40 lines of dead commented code - install/step-ca-install.sh: remove from export builtins --- ct/hoodik.sh | 6 +++--- ct/pixelfed.sh | 8 ++++---- ct/skylite-ux.sh | 6 +++--- install/alpine-install.sh | 1 + install/debian-install.sh | 2 +- install/hoodik-install.sh | 41 -------------------------------------- install/step-ca-install.sh | 4 ++-- install/ubuntu-install.sh | 8 ++------ 8 files changed, 16 insertions(+), 60 deletions(-) diff --git a/ct/hoodik.sh b/ct/hoodik.sh index c43e1232..dadbc842 100644 --- a/ct/hoodik.sh +++ b/ct/hoodik.sh @@ -36,7 +36,7 @@ function update_script() { msg_ok "Stopped Services" msg_info "Backing up Configuration" - cp /opt/hoodik/.env /tmp/hoodik.env.bak + cp /opt/hoodik/.env /opt/hoodik.env.bak msg_ok "Backed up Configuration" msg_info "Updating Hoodik (Patience - this takes 15-20 minutes)" @@ -58,8 +58,8 @@ function update_script() { msg_ok "Updated Hoodik" msg_info "Restoring Configuration" - cp /tmp/hoodik.env.bak /opt/hoodik/.env - rm -f /tmp/hoodik.env.bak + cp /opt/hoodik.env.bak /opt/hoodik/.env + rm -f /opt/hoodik.env.bak msg_ok "Restored Configuration" msg_info "Cleaning Up" diff --git a/ct/pixelfed.sh b/ct/pixelfed.sh index dc49a6fb..446d5541 100644 --- a/ct/pixelfed.sh +++ b/ct/pixelfed.sh @@ -36,14 +36,14 @@ function update_script() { msg_ok "Services stopped" msg_info "Backing up Configuration" - cp /opt/pixelfed/.env /tmp/pixelfed.env.bak + cp /opt/pixelfed/.env /opt/pixelfed.env.bak msg_ok "Configuration backed up" - fetch_and_deploy_gh_release "pixelfed" "pixelfed/pixelfed" "tarball" "latest" "/opt/pixelfed" + CLEAN_INSTALL=1 fetch_and_deploy_gh_release "pixelfed" "pixelfed/pixelfed" "tarball" "latest" "/opt/pixelfed" msg_info "Restoring Configuration" - cp /tmp/pixelfed.env.bak /opt/pixelfed/.env - rm -f /tmp/pixelfed.env.bak + cp /opt/pixelfed.env.bak /opt/pixelfed/.env + rm -f /opt/pixelfed.env.bak msg_ok "Configuration restored" msg_info "Updating Pixelfed" diff --git a/ct/skylite-ux.sh b/ct/skylite-ux.sh index fe6ea7a5..e84df958 100644 --- a/ct/skylite-ux.sh +++ b/ct/skylite-ux.sh @@ -36,14 +36,14 @@ function update_script() { msg_ok "Stopped Service" msg_info "Backing up Data" - cp /opt/skylite-ux/.env /tmp/skylite-ux.env.backup + cp /opt/skylite-ux/.env /opt/skylite-ux.env.bak msg_ok "Backed up Data" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "skylite-ux" "Wetzel402/Skylite-UX" "tarball" msg_info "Restoring Data" - cp /tmp/skylite-ux.env.backup /opt/skylite-ux/.env - rm -f /tmp/skylite-ux.env.backup + cp /opt/skylite-ux.env.bak /opt/skylite-ux/.env + rm -f /opt/skylite-ux.env.bak msg_ok "Restored Data" msg_info "Building Skylite-UX" diff --git a/install/alpine-install.sh b/install/alpine-install.sh index 4d8a5971..91051d2c 100644 --- a/install/alpine-install.sh +++ b/install/alpine-install.sh @@ -23,3 +23,4 @@ msg_ok "Installed Dependencies" motd_ssh customize +cleanup_lxc diff --git a/install/debian-install.sh b/install/debian-install.sh index 45fa3fcf..1d0c6fa1 100644 --- a/install/debian-install.sh +++ b/install/debian-install.sh @@ -16,7 +16,7 @@ update_os setup_hwaccel msg_info "Installing Base Dependencies" -$STD apt-get install -y curl wget ca-certificates +$STD apt install -y curl wget ca-certificates msg_ok "Installed Base Dependencies" # msg_info "Downloading and executing tools.func test suite" diff --git a/install/hoodik-install.sh b/install/hoodik-install.sh index 4e81df1b..8edc7e63 100644 --- a/install/hoodik-install.sh +++ b/install/hoodik-install.sh @@ -13,48 +13,8 @@ setting_up_container network_check update_os -#msg_info "Installing Dependencies" -#$STD apt-get install -y \ -# pkg-config \ -# libssl-dev \ -# libc6-dev \ -# libpq-dev \ -# clang \ -# llvm \ -# nettle-dev \ -# build-essential \ -# make -#msg_ok "Installed Dependencies" - -#setup_rust -#NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs -#fetch_and_deploy_gh_release "hoodik" "hudikhq/hoodik" "tarball" "latest" "/opt/hoodik" fetch_and_deploy_gh_release "hoodik" "hudikhq/hoodik" "prebuild" "latest" "/opt/hoodik" "*x86_64.tar.gz" -#msg_info "Installing wasm-pack" -#$STD cargo install wasm-pack -#msg_ok "Installed wasm-pack" - -#msg_info "Building Hoodik Frontend" -#cd /opt/hoodik -#$STD yarn install --frozen-lockfile -#$STD yarn wasm-pack -#$STD yarn web:build -#msg_ok "Built Hoodik Frontend" - -#msg_info "Building Hoodik Backend" -#cd /opt/hoodik -#$STD cargo build --release -#cp /opt/hoodik/target/release/hoodik /usr/local/bin/hoodik -#chmod +x /usr/local/bin/hoodik -#msg_ok "Built Hoodik Backend" - -#msg_info "Cleaning up build artifacts" -#rm -rf /opt/hoodik/target -#rm -rf /root/.cargo/registry -#rm -rf /opt/hoodik/node_modules -#msg_ok "Cleaned up build artifacts" - msg_info "Configuring Hoodik" mkdir -p /opt/hoodik_data JWT_SECRET=$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | cut -c1-32) @@ -81,7 +41,6 @@ Type=simple User=root WorkingDirectory=/opt/hoodik_data EnvironmentFile=/opt/hoodik/.env -#ExecStart=/usr/local/bin/hoodik ExecStart=/opt/hoodik Restart=always RestartSec=5 diff --git a/install/step-ca-install.sh b/install/step-ca-install.sh index 6be6e56c..ccb401ae 100644 --- a/install/step-ca-install.sh +++ b/install/step-ca-install.sh @@ -24,8 +24,8 @@ msg_info "Installing step-ca and step-cli" $STD apt install -y step-ca step-cli STEPHOME="/root/.step" -$STD export STEPPATH=/etc/step-ca -$STD export STEPHOME=$STEPHOME +export STEPPATH=/etc/step-ca +export STEPHOME=$STEPHOME $STD sed -i '1i export STEPPATH=/etc/step-ca' /etc/profile $STD sed -i '1i export STEPHOME=/root/.step' /etc/profile diff --git a/install/ubuntu-install.sh b/install/ubuntu-install.sh index 80aee17c..0d2e5293 100644 --- a/install/ubuntu-install.sh +++ b/install/ubuntu-install.sh @@ -14,13 +14,9 @@ network_check update_os msg_info "Installing Dependencies" -$STD apt-get install -y jq +$STD apt install -y jq msg_ok "Installed Dependencies" motd_ssh customize - -msg_info "Cleaning up" -$STD apt-get -y autoremove -$STD apt-get -y autoclean -msg_ok "Cleaned" +cleanup_lxc