From ad1240e5353415ea96ee0784ab2bfaee511b4fb3 Mon Sep 17 00:00:00 2001
From: tremor021 <arezina.slavisa@gmail.com>
Date: Mon, 8 Dec 2025 19:16:01 +0100
Subject: [PATCH 1/4] Remove contrib

---
 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 4cf6c4823a4..0513f0deef9 100644
--- a/install/tandoor-install.sh
+++ b/install/tandoor-install.sh
@@ -32,7 +32,7 @@ msg_ok "Installed Dependencies"
 
 NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
 fetch_and_deploy_gh_release "tandoor" "TandoorRecipes/recipes" "tarball" "latest" "/opt/tandoor"
-PG_VERSION="17" PG_MODULES="contrib" setup_postgresql
+PG_VERSION="17" setup_postgresql
 PYTHON_VERSION="3.13" setup_uv
 
 msg_info "Set up PostgreSQL Database"

From e20df12dc05c77f5fc8c6367fe0ddc31ce92f38a Mon Sep 17 00:00:00 2001
From: tremor021 <arezina.slavisa@gmail.com>
Date: Mon, 8 Dec 2025 19:22:36 +0100
Subject: [PATCH 2/4] Update

---
 install/tandoor-install.sh | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh
index 0513f0deef9..14fdee1e2d5 100644
--- a/install/tandoor-install.sh
+++ b/install/tandoor-install.sh
@@ -34,26 +34,8 @@ NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
 fetch_and_deploy_gh_release "tandoor" "TandoorRecipes/recipes" "tarball" "latest" "/opt/tandoor"
 PG_VERSION="17" setup_postgresql
 PYTHON_VERSION="3.13" setup_uv
-
-msg_info "Set up PostgreSQL Database"
-DB_NAME=db_recipes
-DB_USER=tandoor
+PG_DB_USER="tandoor" PG_DB_NAME="db_recipes" PG_DB_EXTENSIONS="unaccent,pg_trgm" setup_postgresql_db
 SECRET_KEY=$(openssl rand -base64 45 | sed 's/\//\\\//g')
-DB_PASS="$(openssl rand -base64 18 | cut -c1-13)"
-$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'"
-$STD sudo -u postgres psql -d "$DB_NAME" -c "CREATE EXTENSION IF NOT EXISTS unaccent;"
-$STD sudo -u postgres psql -d "$DB_NAME" -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-{
-  echo "Tandoor-Credentials"
-  echo "Tandoor Database Name: $DB_NAME"
-  echo "Tandoor Database User: $DB_USER"
-  echo "Tandoor Database Password: $DB_PASS"
-} >>~/tandoor.creds
-msg_ok "Set up PostgreSQL Database"
 
 msg_info "Setup Tandoor"
 mkdir -p /opt/tandoor/{config,api,mediafiles,staticfiles}
@@ -69,10 +51,10 @@ TZ=Europe/Berlin
 
 DB_ENGINE=django.db.backends.postgresql
 POSTGRES_HOST=localhost
-POSTGRES_DB=$DB_NAME
+POSTGRES_DB=$PG_DB_NAME
 POSTGRES_PORT=5432
-POSTGRES_USER=$DB_USER
-POSTGRES_PASSWORD=$DB_PASS
+POSTGRES_USER=$PG_DB_USER
+POSTGRES_PASSWORD=$PG_DB_PASS
 
 STATIC_URL=/staticfiles/
 MEDIA_URL=/media/

From 79497f364f5ca6f94c2461b7a314fb2049282530 Mon Sep 17 00:00:00 2001
From: tremor021 <arezina.slavisa@gmail.com>
Date: Mon, 8 Dec 2025 19:25:20 +0100
Subject: [PATCH 3/4] Update

---
 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 14fdee1e2d5..9d72ea6340e 100644
--- a/install/tandoor-install.sh
+++ b/install/tandoor-install.sh
@@ -60,7 +60,7 @@ STATIC_URL=/staticfiles/
 MEDIA_URL=/media/
 EOF
 
-TANDOOR_VERSION="$(curl -s https://api.github.com/repos/TandoorRecipes/recipes/releases/latest | jq -r .tag_name)"
+TANDOOR_VERSION=$(get_latest_github_release "TandoorRecipes/recipes")
 cat <<EOF >/opt/tandoor/cookbook/version_info.py
 TANDOOR_VERSION = "$TANDOOR_VERSION"
 TANDOOR_REF = "bare-metal"

From 457a0350d26e370e1933d7c3c955a8d121d5793a Mon Sep 17 00:00:00 2001
From: tremor021 <arezina.slavisa@gmail.com>
Date: Mon, 8 Dec 2025 19:27:23 +0100
Subject: [PATCH 4/4] Upda

---
 ct/tandoor.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ct/tandoor.sh b/ct/tandoor.sh
index 1b97ac7f372..981e18dc331 100644
--- a/ct/tandoor.sh
+++ b/ct/tandoor.sh
@@ -55,7 +55,7 @@ function update_script() {
     cd /opt/tandoor/vue3
     $STD yarn install
     $STD yarn build
-    TANDOOR_VERSION="$(curl -fsSL https://api.github.com/repos/TandoorRecipes/recipes/releases/latest | jq -r .tag_name)"
+    TANDOOR_VERSION=$(get_latest_github_release "TandoorRecipes/recipes")
     cat <<EOF >/opt/tandoor/cookbook/version_info.py
 TANDOOR_VERSION = "$TANDOOR_VERSION"
 TANDOOR_REF = "bare-metal"