From 928beedc9d2a5d39fa7fa154550480633b3865ba Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Thu, 22 Jan 2026 16:27:33 +0100
Subject: [PATCH] fixes

---
 ct/wger.sh               |  7 ++-----
 install/jotty-install.sh |  3 ++-
 install/wger-install.sh  | 30 +++++++++++++++++++-----------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/ct/wger.sh b/ct/wger.sh
index ddfbf3e2c..8629b4de3 100644
--- a/ct/wger.sh
+++ b/ct/wger.sh
@@ -35,7 +35,6 @@ function update_script() {
     msg_ok "Stopped Service"
 
     msg_info "Backing up Data"
-    cp -r /opt/wger/db /opt/wger_db_backup
     cp -r /opt/wger/media /opt/wger_media_backup
     cp /opt/wger/.env /opt/wger_env_backup
     msg_ok "Backed up Data"
@@ -43,17 +42,15 @@ function update_script() {
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "wger" "wger-project/wger" "tarball" "latest" "/opt/wger"
 
     msg_info "Restoring Data"
-    cp -r /opt/wger_db_backup/. /opt/wger/db
     cp -r /opt/wger_media_backup/. /opt/wger/media
     cp /opt/wger_env_backup /opt/wger/.env
-    rm -rf /opt/wger_db_backup /opt/wger_media_backup /opt/wger_env_backup
+    rm -rf /opt/wger_media_backup /opt/wger_env_backup
     msg_ok "Restored Data"
 
     msg_info "Updating wger"
     cd /opt/wger
-    source /opt/wger/.env
+    set -a && source /opt/wger/.env && set +a
     export DJANGO_SETTINGS_MODULE=settings.main
-    export DJANGO_DB_DATABASE DJANGO_MEDIA_ROOT DJANGO_STATIC_ROOT SECRET_KEY
     $STD uv pip install .
     $STD uv run python manage.py migrate
     $STD uv run python manage.py collectstatic --no-input
diff --git a/install/jotty-install.sh b/install/jotty-install.sh
index 92944fe93..ef44d1fdb 100644
--- a/install/jotty-install.sh
+++ b/install/jotty-install.sh
@@ -15,6 +15,7 @@ update_os
 
 NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
 #fetch_and_deploy_gh_release "jotty" "fccview/jotty" "tarball" "latest" "/opt/jotty"
+mkdir -p /opt/jotty
 wget -q https://github.com/fccview/jotty/releases/download/develop/jotty-prebuild-develop.tar.gz -O /tmp/jotty.tar.gz
 tar -xzf /tmp/jotty.tar.gz -C /opt/jotty --strip-components=1
 
@@ -22,7 +23,7 @@ msg_info "Setup jotty"
 cd /opt/jotty
 unset NODE_OPTIONS
 export NODE_OPTIONS="--max-old-space-size=3072"
-$STD yarn --frozen-lockfile
+$STD yarn --frozen-lockfiled
 $STD yarn next telemetry disable
 $STD yarn build
 
diff --git a/install/wger-install.sh b/install/wger-install.sh
index dfd0f689f..d6b262c44 100644
--- a/install/wger-install.sh
+++ b/install/wger-install.sh
@@ -16,35 +16,38 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
   apache2 \
-  libapache2-mod-wsgi-py3
+  libapache2-mod-wsgi-py3 \
+  libpq-dev
 msg_ok "Installed Dependencies"
 
 NODE_VERSION="22" NODE_MODULE="yarn,sass" setup_nodejs
 setup_uv
 
+PG_VERSION="16" setup_postgresql
+PG_DB_NAME="wger" PG_DB_USER="wger" setup_postgresql_db
+
 fetch_and_deploy_gh_release "wger" "wger-project/wger" "tarball" "latest" "/opt/wger"
 
 msg_info "Setting up wger"
-mkdir -p /opt/wger/{db,static,media}
-touch /opt/wger/db/database.sqlite
-chown :www-data -R /opt/wger/db
-chmod g+w /opt/wger/db /opt/wger/db/database.sqlite
+mkdir -p /opt/wger/{static,media}
 chmod o+w /opt/wger/media
 cd /opt/wger
 $STD uv venv
 $STD uv pip install .
 SECRET_KEY=$(openssl rand -base64 40)
 cat <<EOF >/opt/wger/.env
-DJANGO_DB_DATABASE=/opt/wger/db/database.sqlite
+DJANGO_DB_ENGINE=django.db.backends.postgresql
+DJANGO_DB_DATABASE=${PG_DB_NAME}
+DJANGO_DB_USER=${PG_DB_USER}
+DJANGO_DB_PASSWORD=${PG_DB_PASS}
+DJANGO_DB_HOST=localhost
+DJANGO_DB_PORT=5432
 DJANGO_MEDIA_ROOT=/opt/wger/media
 DJANGO_STATIC_ROOT=/opt/wger/static
 SECRET_KEY=${SECRET_KEY}
 EOF
+set -a && source /opt/wger/.env && set +a
 export DJANGO_SETTINGS_MODULE=settings.main
-export DJANGO_DB_DATABASE=/opt/wger/db/database.sqlite
-export DJANGO_MEDIA_ROOT=/opt/wger/media
-export DJANGO_STATIC_ROOT=/opt/wger/static
-export SECRET_KEY="${SECRET_KEY}"
 $STD uv run python manage.py migrate
 $STD uv run python manage.py collectstatic --no-input
 msg_ok "Set up wger"
@@ -64,7 +67,12 @@ cat <<EOF >/etc/apache2/sites-available/wger.conf
     WSGIScriptAlias / /opt/wger/wger/wsgi.py
     WSGIPassAuthorization On
     SetEnv DJANGO_SETTINGS_MODULE settings.main
-    SetEnv DJANGO_DB_DATABASE /opt/wger/db/database.sqlite
+    SetEnv DJANGO_DB_ENGINE django.db.backends.postgresql
+    SetEnv DJANGO_DB_DATABASE ${PG_DB_NAME}
+    SetEnv DJANGO_DB_USER ${PG_DB_USER}
+    SetEnv DJANGO_DB_PASSWORD ${PG_DB_PASS}
+    SetEnv DJANGO_DB_HOST localhost
+    SetEnv DJANGO_DB_PORT 5432
     SetEnv DJANGO_MEDIA_ROOT /opt/wger/media
     SetEnv DJANGO_STATIC_ROOT /opt/wger/static
     SetEnv SECRET_KEY ${SECRET_KEY}