From f33afd91632e7976eafa1cfd01fbfd0f77b469d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Sun, 3 Aug 2025 22:04:22 +0200
Subject: [PATCH] Refactor (#6525)

---
 install/openproject-install.sh | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/install/openproject-install.sh b/install/openproject-install.sh
index 4f2ad09ae..00c637522 100644
--- a/install/openproject-install.sh
+++ b/install/openproject-install.sh
@@ -19,21 +19,7 @@ $STD apt-get install -y \
   ca-certificates
 msg_ok "Installed Dependencies"
 
-msg_info "Setting up OpenProject Repository"
-curl -fsSL "https://dl.packager.io/srv/opf/openproject/key" | gpg --dearmor >/etc/apt/trusted.gpg.d/packager-io.gpg
-curl -fsSL "https://dl.packager.io/srv/opf/openproject/stable/15/installer/debian/12.repo" -o "/etc/apt/sources.list.d/openproject.list"
-msg_ok "Setup OpenProject Repository"
-
-msg_info "Setting up PostgreSQL Repository"
-VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
-echo "deb http://apt.postgresql.org/pub/repos/apt ${VERSION}-pgdg main" >/etc/apt/sources.list.d/pgdg.list
-curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor --output /etc/apt/trusted.gpg.d/postgresql.gpg
-msg_ok "Setup PostgreSQL Repository"
-
-msg_info "Installing PostgreSQL"
-$STD apt-get update
-$STD apt-get install -y postgresql
-msg_ok "Installed PostgreSQL"
+PG_VERSION="17" setup_postgresql
 
 msg_info "Setting up PostgreSQL"
 DB_NAME=openproject
@@ -51,6 +37,11 @@ $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER TEMP
 } >>~/openproject.creds
 msg_ok "Set up PostgreSQL"
 
+msg_info "Setting up OpenProject Repository"
+curl -fsSL "https://dl.packager.io/srv/opf/openproject/key" | gpg --dearmor >/etc/apt/trusted.gpg.d/packager-io.gpg
+curl -fsSL "https://dl.packager.io/srv/opf/openproject/stable/15/installer/debian/12.repo" -o "/etc/apt/sources.list.d/openproject.list"
+msg_ok "Setup OpenProject Repository"
+
 msg_info "Installing OpenProject"
 $STD apt-get install -y openproject
 msg_ok "Installed OpenProject"