CHANGELOG.md

@@ -16,31 +16,6 @@ All LXC instances created using this repository come pre-installed with Midnight
 > [!IMPORTANT]
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
-## 2025-01-13
-
-### Changed
-
-### 💥 Breaking Changes
-
-- Update Hoarder: Improvement .env location (see PR comment for little migration) [@MahrWe](https://github.com/MahrWe) ([#1325](https://github.com/community-scripts/ProxmoxVE/pull/1325))
-
-### 🚀 Updated Scripts
-
-- Fix: tandoor.sh: Call version.py to write current version [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1454](https://github.com/community-scripts/ProxmoxVE/pull/1454))
-- Fix inexistent folder on actualbudget update script [@dosten](https://github.com/dosten) ([#1444](https://github.com/community-scripts/ProxmoxVE/pull/1444))
-
-### 🌐 Website
-
-- Update kavita.json: Add info on how to enable folder adding. [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1447](https://github.com/community-scripts/ProxmoxVE/pull/1447))
-
-### 🧰 Maintenance
-
-- GitHub Actions: Fix Shellsheck workflow to only run on changes `*.sh` files [@andygrunwald](https://github.com/andygrunwald) ([#1423](https://github.com/community-scripts/ProxmoxVE/pull/1423))
-
-### ❔ Unlabelled
-
-- feat: allow adding SSH authorized key for root (advanced settings) by @dsiebel [@MickLesk](https://github.com/MickLesk) ([#1456](https://github.com/community-scripts/ProxmoxVE/pull/1456))
-
 ## 2025-01-11
 
 ### Changed

ct/hoarder.sh

@@ -40,10 +40,7 @@ function update_script() {
     msg_ok "Stopped Services"
     msg_info "Updating ${APP} to v${RELEASE}"
     cd /opt
-    if [[ -f /opt/hoarder/.env ]] && [[ ! -f /etc/hoarder/hoarder.env ]]; then
+    mv /opt/hoarder/.env /opt/.env
-      mkdir -p /etc/hoarder
-      mv /opt/hoarder/.env /etc/hoarder/hoarder.env
-    fi
     rm -rf /opt/hoarder
     wget -q "https://github.com/hoarder-app/hoarder/archive/refs/tags/v${RELEASE}.zip"
     unzip -q v${RELEASE}.zip
@@ -57,7 +54,8 @@ function update_script() {
     export DATA_DIR=/opt/hoarder_data
     cd /opt/hoarder/packages/db
     pnpm migrate &>/dev/null
-    sed -i "s/SERVER_VERSION=${PREV_RELEASE}/SERVER_VERSION=${RELEASE}/" /etc/hoarder/hoarder.env
+    mv /opt/.env /opt/hoarder/.env
+    sed -i "s/SERVER_VERSION=${PREV_RELEASE}/SERVER_VERSION=${RELEASE}/" /opt/hoarder/.env
     msg_ok "Updated ${APP} to v${RELEASE}"
 
     msg_info "Starting Services"

ct/tandoor.sh

@@ -45,8 +45,6 @@ function update_script() {
     cd /opt/tandoor/vue
     yarn install >/dev/null 2>&1
     yarn build >/dev/null 2>&1
-    cd /opt/tandoor
-    python3 version.py &>/dev/null
     systemctl restart gunicorn_tandoor
     msg_ok "Updated ${APP}"
   fi

install/hoarder-install.sh

@@ -78,8 +78,7 @@ $STD pnpm install --frozen-lockfile
 
 export DATA_DIR=/opt/hoarder_data
 HOARDER_SECRET=$(openssl rand -base64 36 | cut -c1-24)
-mkdir -p /etc/hoarder
+cat <<EOF >/opt/hoarder/.env
-cat <<EOF >/etc/hoarder/hoarder.env
 SERVER_VERSION=$RELEASE
 NEXTAUTH_SECRET="$HOARDER_SECRET"
 NEXTAUTH_URL="http://localhost:3000"
@@ -130,7 +129,7 @@ After=network.target hoarder-workers.service
 [Service]
 ExecStart=pnpm start
 WorkingDirectory=/opt/hoarder/apps/web
-EnvironmentFile=/etc/hoarder/hoarder.env
+EnvironmentFile=/opt/hoarder/.env
 Restart=always
 
 [Install]
@@ -160,7 +159,7 @@ After=network.target hoarder-browser.service meilisearch.service
 [Service]
 ExecStart=pnpm start:prod
 WorkingDirectory=/opt/hoarder/apps/workers
-EnvironmentFile=/etc/hoarder/hoarder.env
+EnvironmentFile=/opt/hoarder/.env
 Restart=always
 TimeoutStopSec=5
 

misc/build.func

@@ -283,7 +283,6 @@ base_settings() {
   MAC=""
   VLAN=""
   SSH="no"
-  SSH_AUTHORIZED_KEY=""
   TAGS="community-script;"
   
   # Override default settings with variables from ct script
@@ -650,15 +649,6 @@ advanced_settings() {
     echo -e "${ROOTSSH}${BOLD}${DGN}Root SSH Access: ${BGN}$SSH${CL}"
   fi
 
-  if [[ "${SSH}" == "yes" ]]; then
-    SSH_AUTHORIZED_KEY="$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "SSH Authorized key for root (leave empty for none)" 8 58 --title "SSH Key" 3>&1 1>&2 2>&3)"
-
-    if [[ -z "${SSH_AUTHORIZED_KEY}" ]]; then
-      echo "Warning: No SSH key provided."
-    fi
-  else
-    SSH_AUTHORIZED_KEY=""
-  fi	  
   if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
     VERB="yes"
   else
@@ -713,7 +703,7 @@ install_script() {
         ;;
       2)
         header_info
-        echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings on node $PVEHOST_NAME (${SEARCH}Verbose)${CL}"
+        echo -e "${DEFAULT}${BOLD}${BL}Using Default Settings on node $PVEHOST_NAME (${SEARCH}${BL}Verbose)${CL}"
         VERB="yes"
         base_settings "$VERB"  
         echo_default