From 3b9f4da4f1ec6de7072a401ba3d076ac0d5bbfef Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Fri, 23 Feb 2024 19:20:28 -0500
Subject: [PATCH] Update tandoor-install.sh

---
 install/tandoor-install.sh | 95 ++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 51 deletions(-)

diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh
index 37845700..cc5796a5 100644
--- a/install/tandoor-install.sh
+++ b/install/tandoor-install.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 # Copyright (c) 2021-2024 tteck
-# Author: MickLesk (Canbiz)
+# Author: tteck
+# Co-Author: MickLesk (Canbiz)
 # License: MIT
 # https://github.com/tteck/Proxmox/raw/main/LICENSE
 
@@ -16,10 +17,6 @@ update_os
 msg_info "Installing Dependencies (Patience)"
 $STD apt-get install -y --no-install-recommends \
   postgresql \
-  python3 \
-  python3-dev \
-  python3-setuptools \
-  python3-venv \
   build-essential \
   libpq-dev \
   libmagic-dev \
@@ -28,6 +25,7 @@ $STD apt-get install -y --no-install-recommends \
   libsasl2-dev \
   libldap2-dev \
   libssl-dev \
+  gpg \
   curl \
   sudo \
   git \
@@ -35,31 +33,44 @@ $STD apt-get install -y --no-install-recommends \
   mc
 msg_ok "Installed Dependencies"
 
-msg_info "Setup Tandoor (Patience)"
-sudo useradd tandoor
-cd /opt
-git clone https://github.com/vabene1111/recipes.git -b master >/dev/null 2>&1
-mv recipes tandoor >/dev/null 2>&1
-chown -R tandoor:www-data /opt/tandoor >/dev/null 2>&1
-python3 -m venv /opt/tandoor >/dev/null 2>&1
-source /opt/tandoor/bin/activate >/dev/null 2>&1
-curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - >/dev/null 2>&1
-apt install -y nodejs >/dev/null 2>&1
-sudo npm install --global yarn  >/dev/null 2>&1
-/opt/tandoor/bin/pip3 install -r /opt/tandoor/requirements.txt >/dev/null 2>&1
+msg_info "Updating Python3"
+$STD apt-get install -y \
+  python3 \
+  python3-dev \
+  python3-setuptools \
+  python3-pip
+msg_ok "Updated Python3"
+
+msg_info "Setting up Node.js Repository"
+mkdir -p /etc/apt/keyrings
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
+msg_ok "Set up Node.js Repository"
+
+msg_info "Installing Node.js"
+$STD apt-get update
+$STD apt-get install -y nodejs
+$STD npm install -g yarn
+msg_ok "Installed Node.js"
+
+msg_info "Installing Tandoor (Patience)"
+$STD git clone https://github.com/vabene1111/recipes.git -b master /opt/tandoor
+mkdir -p /opt/tandoor/{config,api,mediafiles,staticfiles}
+$STD pip3 install -r /opt/tandoor/requirements.txt
 cd /opt/tandoor/vue
-yarn install --silent  >/dev/null 2>&1
-yarn build --silent  >/dev/null 2>&1
-cd /opt/tandoor
-sudo mkdir -p config api mediafiles staticfiles >/dev/null 2>&1
-msg_ok "Initial Setup complete"
+$STD yarn install
+$STD yarn build
+wget -q https://raw.githubusercontent.com/vabene1111/recipes/develop/.env.template -O /opt/tandoor/.env
+secret_key=$(openssl rand -base64 45 | sed 's/\//\\\//g')
+DB_PASS="$(openssl rand -base64 18 | cut -c1-13)"
+sed -i "s|SECRET_KEY=.*|SECRET_KEY=$secret_key|; s|POSTGRES_HOST=.*|POSTGRES_HOST=127.0.0.1|; s|POSTGRES_PASSWORD=.*|POSTGRES_PASSWORD=$DB_PASS|; s|STATIC_URL=.*|STATIC_URL=/staticfiles/|; s|MEDIA_URL=.*|MEDIA_URL=/mediafiles/|" /opt/tandoor/.env
+msg_ok "Installed Tandoor"
 
-msg_info "Setting up Database"
+msg_info "Setting up PostgreSQL database"
 DB_NAME=djangodb
 DB_USER=djangouser
 DB_ENCODING=utf8
 DB_TIMEZONE=UTC
-DB_PASS="$(openssl rand -base64 18 | cut -c1-13)"
 $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME;"
 $STD sudo -u postgres psql -c "CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';"
 $STD sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;" 
@@ -69,30 +80,16 @@ $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET default_transaction_isola
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO $DB_TIMEZONE;"
 $STD sudo -u postgres psql -c "ALTER USER $DB_USER WITH SUPERUSER;"
 echo "" >>~/tandoor.creds
+echo -e "Tandoor Database Name: \e[32m$DB_NAME\e[0m" >>~/tandoor.creds
 echo -e "Tandoor Database User: \e[32m$DB_USER\e[0m" >>~/tandoor.creds
 echo -e "Tandoor Database Password: \e[32m$DB_PASS\e[0m" >>~/tandoor.creds
-echo -e "Tandoor Database Name: \e[32m$DB_NAME\e[0m" >>~/tandoor.creds
+export $(cat /opt/tandoor/.env |grep "^[^#]" | xargs)
+/usr/bin/python3 /opt/tandoor/manage.py migrate >/dev/null 2>&1
+/usr/bin/python3 /opt/tandoor/manage.py collectstatic --no-input >/dev/null 2>&1
+/usr/bin/python3 /opt/tandoor/manage.py collectstatic_js_reverse >/dev/null 2>&1
 msg_ok "Set up PostgreSQL database"
 
-msg_info "Setting up Tandoor Env"
-wget https://raw.githubusercontent.com/vabene1111/recipes/develop/.env.template -O /opt/tandoor/.env >/dev/null 2>&1
-secret_key=$(openssl rand -base64 45 | sed 's/\//\\\//g') >/dev/null 2>&1
-sudo sed -i "s/SECRET_KEY=.*/SECRET_KEY=$secret_key/" /opt/tandoor/.env
-sudo sed -i 's/POSTGRES_HOST=.*/POSTGRES_HOST=127.0.0.1/' /opt/tandoor/.env
-sudo sed -i "s/POSTGRES_PASSWORD=.*/POSTGRES_PASSWORD=$DB_PASS/" /opt/tandoor/.env
-sudo sed -i 's/STATIC_URL=.*/STATIC_URL=\/staticfiles\//' /opt/tandoor/.env
-sudo sed -i 's/MEDIA_URL=.*/MEDIA_URL=\/mediafiles\//' /opt/tandoor/.env
-msg_ok "Tandoor successfully set up"
-
-msg_info "Initialize Application"
-export $(cat /opt/tandoor/.env |grep "^[^#]" | xargs) >/dev/null 2>&1
-/opt/tandoor/bin/python3 /opt/tandoor/manage.py migrate >/dev/null 2>&1
-$STD sudo -u postgres psql -c "ALTER USER $DB_USER WITH NOSUPERUSER;"
-/opt/tandoor/bin/python3 /opt/tandoor/manage.py collectstatic --no-input >/dev/null 2>&1
-/opt/tandoor/bin/python3 /opt/tandoor/manage.py collectstatic_js_reverse >/dev/null 2>&1
-msg_ok "Application Initialized"
-
-msg_info "Set up web services"
+msg_info "Creating Services"
 cat <<EOF >/etc/systemd/system/gunicorn_tandoor.service
 [Unit]
 Description=gunicorn daemon for tandoor
@@ -102,18 +99,14 @@ After=network.target
 Type=simple
 Restart=always
 RestartSec=3
-User=tandoor
-Group=www-data
 WorkingDirectory=/opt/tandoor
 EnvironmentFile=/opt/tandoor/.env
-ExecStart=/opt/tandoor/bin/gunicorn --error-logfile /tmp/gunicorn_err.log --log-level debug --capture-output --bind unix:/opt/tandoor/tandoor.sock recipes.wsgi:application
+ExecStart=/usr/local/bin/gunicorn --error-logfile /tmp/gunicorn_err.log --log-level debug --capture-output --bind unix:/opt/tandoor/tandoor.sock recipes.wsgi:application
 
 [Install]
 WantedBy=multi-user.target
 EOF
 
-$STD sudo systemctl enable --now gunicorn_tandoor
-
 cat << 'EOF' >/etc/nginx/conf.d/tandoor.conf
 server {
     listen 8002;
@@ -136,8 +129,8 @@ server {
     }
 }
 EOF
-
-$STD sudo systemctl reload nginx
+systemctl reload nginx
+systemctl enable -q --now gunicorn_tandoor
 msg_ok "Created Services"
 
 motd_ssh