From f5f28231a74693eea6a38dea2b6476e2fb0317a8 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 23 Feb 2024 15:12:30 -0500 Subject: [PATCH 01/10] Update build.func tweak SSH message --- misc/build.func | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/misc/build.func b/misc/build.func index 968cb83e..604b0468 100644 --- a/misc/build.func +++ b/misc/build.func @@ -119,14 +119,13 @@ arch_check() { # This function checks if the script is running through SSH and prompts the user to confirm if they want to proceed or exit. ssh_check() { - if command -v pveversion >/dev/null 2>&1; then - if [ -n "${SSH_CLIENT:+x}" ]; then - if whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "SSH DETECTED" --yesno "It's suggested to use the Proxmox shell instead of SSH, since SSH can create issues while gathering variables. Would you like to proceed with using SSH?" 10 62; then - echo "you've been warned" - else - clear - exit - fi + if command -v pveversion >/dev/null 2>&1 && [ -n "${SSH_CLIENT:+x}" ]; then + if whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "SSH DETECTED" --yesno "It's advisable to utilize the Proxmox shell rather than SSH, as there may be potential complications with variable retrieval. Proceed using SSH?" 10 72; then + whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Proceed using SSH" "You've chosen to proceed using SSH. If any issues arise, please run the script in the Proxmox shell before creating a repository issue." 10 72 + else + clear + echo "Exiting due to SSH usage. Please consider using the Proxmox shell." + exit fi fi } From e845685b0c1fdce9d00e63c14c8177bb5a9e1a0c Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Sat, 24 Feb 2024 02:28:02 +0100 Subject: [PATCH 02/10] Add Tandoor Recipes LXC (#2551) --- ct/tandoor.sh | 90 +++++++++++++++++++++++ install/tandoor-install.sh | 142 +++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+) create mode 100644 ct/tandoor.sh create mode 100644 install/tandoor-install.sh diff --git a/ct/tandoor.sh b/ct/tandoor.sh new file mode 100644 index 00000000..3dba8b02 --- /dev/null +++ b/ct/tandoor.sh @@ -0,0 +1,90 @@ +#!/usr/bin/env bash +source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func) +# Copyright (c) 2021-2024 tteck +# Author: tteck +# Co-Author: MickLesk (Canbiz) +# License: MIT +# https://github.com/tteck/Proxmox/raw/main/LICENSE + +function header_info { +clear +cat <<"EOF" + ______ __ ____ _ + /_ __/___ _____ ____/ /___ ____ _____ / __ \___ _____(_)___ ___ _____ + / / / __ `/ __ \/ __ / __ \/ __ \/ ___/ / /_/ / _ \/ ___/ / __ \/ _ \/ ___/ + / / / /_/ / / / / /_/ / /_/ / /_/ / / / _, _/ __/ /__/ / /_/ / __(__ ) +/_/ \__,_/_/ /_/\__,_/\____/\____/_/ /_/ |_|\___/\___/_/ .___/\___/____/ + /_/ +EOF +} +header_info +echo -e "Loading..." +APP="Tandoor" +var_disk="10" +var_cpu="4" +var_ram="4096" +var_os="debian" +var_version="12" +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 +} + +function update_script() { +header_info +if [[ ! -d /opt/tandoor ]]; then + msg_error "No ${APP} Installation Found!"; + exit; +fi +msg_info "Updating ${APP} LXC" +if cd /opt/tandoor && git pull | grep -q 'Already up to date'; then + msg_error "There is currently no update path available." +else + export $(cat /opt/tandoor/.env | grep "^[^#]" | xargs) + /opt/tandoor/bin/pip3 install -r requirements.txt >/dev/null 2>&1 + /opt/tandoor/bin/python3 manage.py migrate >/dev/null 2>&1 + /opt/tandoor/bin/python3 manage.py collectstatic --no-input >/dev/null 2>&1 + /opt/tandoor/bin/python3 manage.py collectstatic_js_reverse >/dev/null 2>&1 + cd /opt/tandoor/vue + yarn install >/dev/null 2>&1 + yarn build >/dev/null 2>&1 + sudo systemctl restart gunicorn_tandoor +fi +exit +} + +start +build_container +description + +msg_info "Setting Container to Normal Resources" +pct set $CTID -memory 2048 +pct set $CTID -cores 2 +msg_ok "Set Container to Normal Resources" + +msg_ok "Completed Successfully!\n" +echo -e "${APP} Setup should be reachable by going to the following URL. + ${BL}http://${IP}:8002${CL} \n" diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh new file mode 100644 index 00000000..cc5796a5 --- /dev/null +++ b/install/tandoor-install.sh @@ -0,0 +1,142 @@ +#!/usr/bin/env bash + +# Copyright (c) 2021-2024 tteck +# Author: tteck +# Co-Author: MickLesk (Canbiz) +# License: MIT +# https://github.com/tteck/Proxmox/raw/main/LICENSE + +source /dev/stdin <<< "$FUNCTIONS_FILE_PATH" +color +verb_ip6 +catch_errors +setting_up_container +network_check +update_os + +msg_info "Installing Dependencies (Patience)" +$STD apt-get install -y --no-install-recommends \ + postgresql \ + build-essential \ + libpq-dev \ + libmagic-dev \ + libzbar0 \ + nginx \ + libsasl2-dev \ + libldap2-dev \ + libssl-dev \ + gpg \ + curl \ + sudo \ + git \ + make \ + mc +msg_ok "Installed Dependencies" + +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 +$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 PostgreSQL database" +DB_NAME=djangodb +DB_USER=djangouser +DB_ENCODING=utf8 +DB_TIMEZONE=UTC +$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;" +$STD sudo -u postgres psql -c "ALTER DATABASE $DB_NAME OWNER TO $DB_USER;" +$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO $DB_ENCODING;" +$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 $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 +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 "Creating Services" +cat </etc/systemd/system/gunicorn_tandoor.service +[Unit] +Description=gunicorn daemon for tandoor +After=network.target + +[Service] +Type=simple +Restart=always +RestartSec=3 +WorkingDirectory=/opt/tandoor +EnvironmentFile=/opt/tandoor/.env +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 + +cat << 'EOF' >/etc/nginx/conf.d/tandoor.conf +server { + listen 8002; + #access_log /var/log/nginx/access.log; + #error_log /var/log/nginx/error.log; + + # serve media files + location /static/ { + alias /opt/tandoor/staticfiles/; + } + + location /media/ { + alias /opt/tandoor/mediafiles/; + } + + location / { + proxy_set_header Host $http_host; + proxy_pass http://unix:/opt/tandoor/tandoor.sock; + proxy_set_header X-Forwarded-Proto $scheme; + } +} +EOF +systemctl reload nginx +systemctl enable -q --now gunicorn_tandoor +msg_ok "Created Services" + +motd_ssh +customize + +msg_info "Cleaning up" +$STD apt-get autoremove +$STD apt-get autoclean +msg_ok "Cleaned" From 5860f048fad5aaa5bc3f963932dd0a1e02a37629 Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 23 Feb 2024 20:36:27 -0500 Subject: [PATCH 03/10] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f956a7d..9e6952e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment. - 🚨 **The scripts in the repository will no longer provide support for Proxmox VE 7 starting from July 2024 (scripts will not execute on PVE7). Subsequent Proxmox VE - Support Lifecycle** +## 2024-02-23 + +### Changed + +- **Tandoor Recipes LXC** + - NEW Script (Thanks @MickLesk) + ## 2024-02-21 ### Changed From bd94b1523475cd097c1e15edde2ea58d3ffc16b1 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Feb 2024 04:51:46 -0500 Subject: [PATCH 04/10] Update tandoor-install.sh tweak --- install/tandoor-install.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index cc5796a5..08009216 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -61,16 +61,21 @@ cd /opt/tandoor/vue $STD yarn install $STD yarn build wget -q https://raw.githubusercontent.com/vabene1111/recipes/develop/.env.template -O /opt/tandoor/.env +DB_NAME=tandordb +DB_USER=tandoor +DB_ENCODING=utf8 +DB_TIMEZONE=UTC 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 +sed -i -e "s|SECRET_KEY=.*|SECRET_KEY=$secret_key|g" \ + -e "s|POSTGRES_HOST=.*|POSTGRES_HOST=127.0.0.1|g" \ + -e "s|POSTGRES_PASSWORD=.*|POSTGRES_PASSWORD=$DB_PASS|g" \ + -e "s|POSTGRES_DB=.*|POSTGRES_DB=$DB_NAME|g" \ + -e "s|POSTGRES_USER=.*|POSTGRES_USER=$DB_USER|g" \ + -e "\$a\STATIC_URL=/staticfiles\\nMEDIA_URL=/mediafiles" /opt/tandoor/.env msg_ok "Installed Tandoor" msg_info "Setting up PostgreSQL database" -DB_NAME=djangodb -DB_USER=djangouser -DB_ENCODING=utf8 -DB_TIMEZONE=UTC $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;" From 6dc6d3cb14f2f5d51acbead405b5421d3b00b563 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Feb 2024 05:04:29 -0500 Subject: [PATCH 05/10] Update tandoor-install.sh tweak --- install/tandoor-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index 08009216..822eaa5b 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -61,8 +61,8 @@ cd /opt/tandoor/vue $STD yarn install $STD yarn build wget -q https://raw.githubusercontent.com/vabene1111/recipes/develop/.env.template -O /opt/tandoor/.env -DB_NAME=tandordb -DB_USER=tandoor +DB_NAME=djangodb +DB_USER=djangouser DB_ENCODING=utf8 DB_TIMEZONE=UTC secret_key=$(openssl rand -base64 45 | sed 's/\//\\\//g') From b1974f5e0e35cdc4e6355e3891fba1b322823a82 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Feb 2024 05:26:11 -0500 Subject: [PATCH 06/10] Update tandoor-install.sh fix sed --- install/tandoor-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index 822eaa5b..cc2c4900 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -72,7 +72,7 @@ sed -i -e "s|SECRET_KEY=.*|SECRET_KEY=$secret_key|g" \ -e "s|POSTGRES_PASSWORD=.*|POSTGRES_PASSWORD=$DB_PASS|g" \ -e "s|POSTGRES_DB=.*|POSTGRES_DB=$DB_NAME|g" \ -e "s|POSTGRES_USER=.*|POSTGRES_USER=$DB_USER|g" \ - -e "\$a\STATIC_URL=/staticfiles\\nMEDIA_URL=/mediafiles" /opt/tandoor/.env + -e "\$a\\STATIC_URL=/staticfiles/\nMEDIA_URL=/mediafiles/" /opt/tandoor/.env msg_ok "Installed Tandoor" msg_info "Setting up PostgreSQL database" From 50872c6d9f3a2829530ffde70cc2fc2d5fe77afa Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Feb 2024 07:15:47 -0500 Subject: [PATCH 07/10] Update tandoor-install.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Final tweaks 🤞🏻 --- install/tandoor-install.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index cc2c4900..8af16863 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -61,29 +61,23 @@ cd /opt/tandoor/vue $STD yarn install $STD yarn build wget -q https://raw.githubusercontent.com/vabene1111/recipes/develop/.env.template -O /opt/tandoor/.env -DB_NAME=djangodb -DB_USER=djangouser +DB_NAME=db_recipes +DB_USER=tandoor DB_ENCODING=utf8 DB_TIMEZONE=UTC secret_key=$(openssl rand -base64 45 | sed 's/\//\\\//g') DB_PASS="$(openssl rand -base64 18 | cut -c1-13)" sed -i -e "s|SECRET_KEY=.*|SECRET_KEY=$secret_key|g" \ - -e "s|POSTGRES_HOST=.*|POSTGRES_HOST=127.0.0.1|g" \ + -e "s|POSTGRES_HOST=.*|POSTGRES_HOST=localhost|g" \ -e "s|POSTGRES_PASSWORD=.*|POSTGRES_PASSWORD=$DB_PASS|g" \ -e "s|POSTGRES_DB=.*|POSTGRES_DB=$DB_NAME|g" \ -e "s|POSTGRES_USER=.*|POSTGRES_USER=$DB_USER|g" \ - -e "\$a\\STATIC_URL=/staticfiles/\nMEDIA_URL=/mediafiles/" /opt/tandoor/.env + -e "\$a\STATIC_URL=/staticfiles/" /opt/tandoor/.env msg_ok "Installed Tandoor" msg_info "Setting up PostgreSQL database" -$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;" -$STD sudo -u postgres psql -c "ALTER DATABASE $DB_NAME OWNER TO $DB_USER;" -$STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO $DB_ENCODING;" -$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 $DB_TIMEZONE;" -$STD sudo -u postgres psql -c "ALTER USER $DB_USER WITH SUPERUSER;" +$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;" 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 From 966517ef447239e2b1cacfb4e36c00b071d66a20 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Feb 2024 09:48:47 -0500 Subject: [PATCH 08/10] Update tandoor-install.sh Debug off --- install/tandoor-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index 8af16863..cb5bfc49 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -72,7 +72,8 @@ sed -i -e "s|SECRET_KEY=.*|SECRET_KEY=$secret_key|g" \ -e "s|POSTGRES_PASSWORD=.*|POSTGRES_PASSWORD=$DB_PASS|g" \ -e "s|POSTGRES_DB=.*|POSTGRES_DB=$DB_NAME|g" \ -e "s|POSTGRES_USER=.*|POSTGRES_USER=$DB_USER|g" \ - -e "\$a\STATIC_URL=/staticfiles/" /opt/tandoor/.env + -e "\$a\STATIC_URL=/staticfiles/" \ + -e "\$a\DEBUG=0" /opt/tandoor/.env msg_ok "Installed Tandoor" msg_info "Setting up PostgreSQL database" From 76d43006d6a6588b556a3770f30c775e4988d564 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Feb 2024 10:11:37 -0500 Subject: [PATCH 09/10] Update tandoor-install.sh tweak --- install/tandoor-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index cb5bfc49..198b5651 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -73,7 +73,7 @@ sed -i -e "s|SECRET_KEY=.*|SECRET_KEY=$secret_key|g" \ -e "s|POSTGRES_DB=.*|POSTGRES_DB=$DB_NAME|g" \ -e "s|POSTGRES_USER=.*|POSTGRES_USER=$DB_USER|g" \ -e "\$a\STATIC_URL=/staticfiles/" \ - -e "\$a\DEBUG=0" /opt/tandoor/.env + -e "\$a\# DEBUG=0" /opt/tandoor/.env msg_ok "Installed Tandoor" msg_info "Setting up PostgreSQL database" From 526b5e7b54290c6705c0270a5604f2a06d51549c Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 24 Feb 2024 11:30:49 -0500 Subject: [PATCH 10/10] Update tandoor-install.sh PostgreSQL 16 --- install/tandoor-install.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh index 198b5651..509121e4 100644 --- a/install/tandoor-install.sh +++ b/install/tandoor-install.sh @@ -16,7 +16,6 @@ update_os msg_info "Installing Dependencies (Patience)" $STD apt-get install -y --no-install-recommends \ - postgresql \ build-essential \ libpq-dev \ libmagic-dev \ @@ -72,11 +71,14 @@ sed -i -e "s|SECRET_KEY=.*|SECRET_KEY=$secret_key|g" \ -e "s|POSTGRES_PASSWORD=.*|POSTGRES_PASSWORD=$DB_PASS|g" \ -e "s|POSTGRES_DB=.*|POSTGRES_DB=$DB_NAME|g" \ -e "s|POSTGRES_USER=.*|POSTGRES_USER=$DB_USER|g" \ - -e "\$a\STATIC_URL=/staticfiles/" \ - -e "\$a\# DEBUG=0" /opt/tandoor/.env + -e "\$a\STATIC_URL=/staticfiles/" /opt/tandoor/.env msg_ok "Installed Tandoor" -msg_info "Setting up PostgreSQL database" +msg_info "Install/Set up PostgreSQL Database" +curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc|gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg +echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >/etc/apt/sources.list.d/pgdg.list +$STD apt-get update +$STD apt-get install -y postgresql-16 $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;" echo "" >>~/tandoor.creds @@ -87,7 +89,7 @@ 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_ok "Set up PostgreSQL Database" msg_info "Creating Services" cat </etc/systemd/system/gunicorn_tandoor.service