Merge remote-tracking branch 'upstream/main'

2024-05-09 16:50:55 +10:00
parent 20b6ff5357 d46076cab9
commit 51d72c114e
13 changed files with 252 additions and 299 deletions
@@ -22,8 +22,8 @@ APP="Home Assistant-Core"
 var_disk="8"
 var_cpu="2"
 var_ram="1024"
-var_os="debian"
-var_version="12"
+var_os="ubuntu"
+var_version="24.04"
 variables
 color
 catch_errors
@@ -29,7 +29,7 @@ color
 catch_errors

 function default_settings() {
-  CT_TYPE="0"
+  CT_TYPE="1"
  PW=""
  CT_ID=$NEXTID
  HN=$NSAPP
@@ -59,7 +59,6 @@ function update_script() {
    exit
  fi
  RELEASE=$(curl -s https://api.github.com/repos/paperless-ngx/paperless-ngx/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  SER=/etc/systemd/system/paperless-task-queue.service

  UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 2 \
    "1" "Update Paperless-ngx to $RELEASE" ON \
@@ -67,65 +66,38 @@ function update_script() {
    3>&1 1>&2 2>&3)
  header_info
  if [ "$UPD" == "1" ]; then
-    msg_info "Stopping Paperless-ngx"
-    systemctl stop paperless-consumer paperless-webserver paperless-scheduler
-    if [ -f "$SER" ]; then
-      systemctl stop paperless-task-queue.service
-    fi
-    sleep 1
-    msg_ok "Stopped Paperless-ngx"
+    if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
+      msg_info "Stopping all Paperless-ngx Services"
+      systemctl stop paperless-consumer paperless-webserver paperless-scheduler paperless-task-queue.service
+      msg_ok "Stopped all Paperless-ngx Services"

-    msg_info "Updating to ${RELEASE}"
-    cd ~
-    if [ "$(dpkg -l | awk '/libmariadb-dev-compat/ {print }' | wc -l)" != 1 ]; then apt-get install -y libmariadb-dev-compat; fi &>/dev/null
-    wget https://github.com/paperless-ngx/paperless-ngx/releases/download/$RELEASE/paperless-ngx-$RELEASE.tar.xz &>/dev/null
-    tar -xf paperless-ngx-$RELEASE.tar.xz &>/dev/null
-    cp -r /opt/paperless/paperless.conf paperless-ngx/
-    cp -r paperless-ngx/* /opt/paperless/
-    cd /opt/paperless
-    pip install -r requirements.txt &>/dev/null
-    cd /opt/paperless/src
-    /usr/bin/python3 manage.py migrate &>/dev/null
-    if [ -f "$SER" ]; then
-      msg_ok "paperless-task-queue.service Exists."
+      msg_info "Updating to ${RELEASE}"
+      cd ~
+      wget -q https://github.com/paperless-ngx/paperless-ngx/releases/download/$RELEASE/paperless-ngx-$RELEASE.tar.xz
+      tar -xf paperless-ngx-$RELEASE.tar.xz
+      cp -r /opt/paperless/paperless.conf paperless-ngx/
+      cp -r paperless-ngx/* /opt/paperless/
+      cd /opt/paperless
+      pip install -r requirements.txt &>/dev/null
+      cd /opt/paperless/src
+      /usr/bin/python3 manage.py migrate &>/dev/null
+      echo "${RELEASE}" >/opt/${APP}_version.txt
+      msg_ok "Updated to ${RELEASE}"
+
+      msg_info "Cleaning up"
+      cd ~
+      rm paperless-ngx-$RELEASE.tar.xz
+      rm -rf paperless-ngx
+      msg_ok "Cleaned"
+
+      msg_info "Starting all Paperless-ngx Services"
+      systemctl start paperless-consumer paperless-webserver paperless-scheduler paperless-task-queue.service
+      sleep 1
+      msg_ok "Started all Paperless-ngx Services"
+      msg_ok "Updated Successfully!\n"
    else
-      cat <<EOF >/etc/systemd/system/paperless-task-queue.service
-[Unit]
-Description=Paperless Celery Workers
-Requires=redis.service
-[Service]
-WorkingDirectory=/opt/paperless/src
-ExecStart=celery --app paperless worker --loglevel INFO
-[Install]
-WantedBy=multi-user.target
-EOF
-      systemctl enable paperless-task-queue &>/dev/null
-      msg_ok "paperless-task-queue.service Created."
+      msg_ok "No update required. ${APP} is already at ${RELEASE}"
    fi
-    cat <<EOF >/etc/systemd/system/paperless-scheduler.service
-[Unit]
-Description=Paperless Celery beat
-Requires=redis.service
-[Service]
-WorkingDirectory=/opt/paperless/src
-ExecStart=celery --app paperless beat --loglevel INFO
-[Install]
-WantedBy=multi-user.target
-EOF
-    msg_ok "Updated to ${RELEASE}"
-
-    msg_info "Cleaning up"
-    cd ~
-    rm paperless-ngx-$RELEASE.tar.xz
-    rm -rf paperless-ngx
-    msg_ok "Cleaned"
-
-    msg_info "Starting Paperless-ngx"
-    systemctl daemon-reload
-    systemctl start paperless-consumer paperless-webserver paperless-scheduler paperless-task-queue.service
-    sleep 1
-    msg_ok "Started Paperless-ngx"
-    msg_ok "Updated Successfully!\n"
    exit
  fi
  if [ "$UPD" == "2" ]; then
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func)
+# Copyright (c) 2021-2024 tteck
+# Author: tteck (tteckster)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+    ____             __        __  __
+   / __ \____  _____/ /_____  / /_/ /_  ____ _________
+  / /_/ / __ \/ ___/ //_/ _ \/ __/ __ \/ __ `/ ___/ _ \
+ / ____/ /_/ / /__/ ,< /  __/ /_/ /_/ / /_/ (__  )  __/
+/_/    \____/\___/_/|_|\___/\__/_.___/\__,_/____/\___/
+
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Pocketbase"
+var_disk="8"
+var_cpu="1"
+var_ram="512"
+var_os="ubuntu"
+var_version="22.04"
+variables
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET="dhcp"
+  GATE=""
+  APT_CACHER=""
+  APT_CACHER_IP=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+             ${BL}http://${IP}:8080/_${CL}"
@@ -29,7 +29,7 @@ color
 catch_errors

 function default_settings() {
-  CT_TYPE="0"
+  CT_TYPE="1"
  PW=""
  CT_ID=$NEXTID
  HN=$NSAPP