From b22265047c656067f762e68e6932ffa9d295ca9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Wed, 24 Dec 2025 15:27:20 +0100
Subject: [PATCH] Refactor (#10278)

---
 install/openproject-install.sh | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/install/openproject-install.sh b/install/openproject-install.sh
index d5dc8d43b..444212db8 100644
--- a/install/openproject-install.sh
+++ b/install/openproject-install.sh
@@ -14,28 +14,14 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt install -y \
-  apt-transport-https \
-  ca-certificates
+$STD apt install -y apt-transport-https
 msg_ok "Installed Dependencies"
 
 PG_VERSION="17" setup_postgresql
-
-msg_info "Setting up PostgreSQL"
-DB_NAME=openproject
-DB_USER=openproject
-DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13)
+PG_DB_NAME="openproject" PG_DB_USER="openproject" setup_postgresql_db
 API_KEY=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | 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;"
-{
-  echo "OpenProject-Credentials"
-  echo -e "OpenProject Database User: $DB_USER"
-  echo -e "OpenProject Database Password: $DB_PASS"
-  echo -e "OpenProject Database Name: $DB_NAME"
-  echo -e "OpenProject API Key: $API_KEY"
-} >>~/openproject.creds
-msg_ok "Set up PostgreSQL"
+echo "OpenProject API Key: $API_KEY" >>~/openproject.creds
+import_local_ip
 
 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
@@ -48,7 +34,6 @@ $STD apt install -y openproject
 msg_ok "Installed OpenProject"
 
 msg_info "Configuring OpenProject"
-IP_ADDR=$(hostname -I | cut -d' ' -f1)
 cat <<EOF >/etc/openproject/installer.dat
 openproject/edition default
 
@@ -56,13 +41,13 @@ postgres/retry retry
 postgres/autoinstall reuse
 postgres/db_host 127.0.0.1
 postgres/db_port 5432
-postgres/db_username ${DB_USER}
-postgres/db_password ${DB_PASS}
-postgres/db_name ${DB_NAME}
+postgres/db_username ${PG_DB_USER}
+postgres/db_password ${PG_DB_PASS}
+postgres/db_name ${PG_DB_NAME}
 server/autoinstall install
 server/variant apache2
 
-server/hostname ${IP_ADDR}
+server/hostname ${LOCAL_IP}
 server/server_path_prefix /openproject
 server/ssl no
 server/variant apache2
@@ -75,7 +60,6 @@ memcached/autoinstall install
 openproject/admin_email admin@example.net
 openproject/default_language en
 EOF
-
 $STD sudo openproject configure
 msg_ok "Configured OpenProject"