Update ubuntu.sh

set default unprivileged

ct/omada.sh

@@ -29,7 +29,7 @@ color
 catch_errors
 
 function default_settings() {
-  CT_TYPE="0"
+  CT_TYPE="1"
   PW=""
   CT_ID=$NEXTID
   HN=$NSAPP

ct/paperless-ngx.sh

@@ -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,51 +66,20 @@ 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"
+    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
+    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
-    if [ -f "$SER" ]; then
-      msg_ok "paperless-task-queue.service Exists."
-    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."
-    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"
@@ -120,11 +88,10 @@ EOF
     rm -rf paperless-ngx
     msg_ok "Cleaned"
 
-    msg_info "Starting Paperless-ngx"
-    systemctl daemon-reload
+    msg_info "Starting all Paperless-ngx Services"
     systemctl start paperless-consumer paperless-webserver paperless-scheduler paperless-task-queue.service
     sleep 1
-    msg_ok "Started Paperless-ngx"
+    msg_ok "Started all Paperless-ngx Services"
     msg_ok "Updated Successfully!\n"
     exit
   fi

ct/ubuntu.sh

@@ -29,7 +29,7 @@ color
 catch_errors
 
 function default_settings() {
-  CT_TYPE="0"
+  CT_TYPE="1"
   PW=""
   CT_ID=$NEXTID
   HN=$NSAPP

install/frigate-install.sh

@@ -43,8 +43,6 @@ if [[ "$CTTYPE" == "0" ]]; then
   chgrp video /dev/dri
   chmod 755 /dev/dri
   chmod 660 /dev/dri/*
-  $STD adduser $(id -u -n) video
-  $STD adduser $(id -u -n) render
 fi
 msg_ok "Set Up Hardware Acceleration"
 

install/paperless-ngx-install.sh

@@ -13,15 +13,6 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Python3"
-$STD apt-get install -y --no-install-recommends \
-  python3 \
-  python3-pip \
-  python3-dev \
-  python3-setuptools \
-  python3-wheel
-msg_ok "Installed Python3"
-
 msg_info "Installing Dependencies (Patience)"
 $STD apt-get install -y --no-install-recommends \
   redis \
@@ -49,6 +40,15 @@ $STD apt-get install -y --no-install-recommends \
   mc
 msg_ok "Installed Dependencies"
 
+msg_info "Installing Python3 Dependencies"
+$STD apt-get install -y --no-install-recommends \
+  python3 \
+  python3-pip \
+  python3-dev \
+  python3-setuptools \
+  python3-wheel
+msg_ok "Installed Python3 Dependencies"
+
 msg_info "Installing OCR Dependencies (Patience)"
 $STD apt-get install -y --no-install-recommends \
   unpaper \
@@ -97,13 +97,15 @@ $STD python3 -m nltk.downloader -d /usr/share/nltk_data all
 msg_ok "Installed Natural Language Toolkit"
 
 msg_info "Setting up PostgreSQL database"
-export LC_ALL=C.UTF-8
 DB_NAME=paperlessdb
 DB_USER=paperless
 DB_PASS="$(openssl rand -base64 18 | cut -c1-13)"
 SECRET_KEY="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)"
 $STD sudo -u postgres psql -c "CREATE ROLE $DB_USER WITH LOGIN PASSWORD '$DB_PASS';"
 $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER TEMPLATE template0;"
+$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8';"
+$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';"
+$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC'"
 echo "" >>~/paperless.creds
 echo -e "Paperless-ngx Database User: \e[32m$DB_USER\e[0m" >>~/paperless.creds
 echo -e "Paperless-ngx Database Password: \e[32m$DB_PASS\e[0m" >>~/paperless.creds