From 35a9d4df821a7da77fd099499a04cbe28a92601f Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Sat, 24 Aug 2024 09:30:47 -0600
Subject: [PATCH] PostgreSQL update

---
 freebsd/resources/config.sh     |  2 +-
 freebsd/resources/postgresql.sh | 49 +++++----------------------------
 2 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/freebsd/resources/config.sh b/freebsd/resources/config.sh
index 5ffdb4e..849ebbd 100755
--- a/freebsd/resources/config.sh
+++ b/freebsd/resources/config.sh
@@ -16,7 +16,7 @@ database_name=fusionpbx         # Database name (safe characters A-Z, a-z, 0-9)
 database_username=fusionpbx     # Database username (safe characters A-Z, a-z, 0-9)
 database_password=random        # random or a custom value (safe characters A-Z, a-z, 0-9)
 database_enabled=true           # true or false
-database_version=16             # Postgres 15, 14, 13, 12, 11, 10, 9.6
+database_version=16             # Postgres 16, 15, 14, 13, 12
 database_host=127.0.0.1         # hostname or IP address
 database_port=5432              # port number
 database_backup=false           # true or false
diff --git a/freebsd/resources/postgresql.sh b/freebsd/resources/postgresql.sh
index e1d8b2a..094b756 100755
--- a/freebsd/resources/postgresql.sh
+++ b/freebsd/resources/postgresql.sh
@@ -24,6 +24,10 @@ password=$(cat /dev/random | env LC_CTYPE=C tr -dc a-zA-Z0-9 | head -c 20)
 echo "Install PostgreSQL and create the database and users\n"
 
 #postgres install
+if [ ."$database_version" = ."16" ]; then
+	pkg install --yes postgresql16-server
+	#cd /usr/ports/databases/postgresql15-server/ && make install clean BATCH=yes
+fi
 if [ ."$database_version" = ."15" ]; then
 	pkg install --yes postgresql15-server
 	#cd /usr/ports/databases/postgresql15-server/ && make install clean BATCH=yes
@@ -40,30 +44,6 @@ if [ ."$database_version" = ."12" ]; then
 	pkg install --yes postgresql12-server
 	#cd /usr/ports/databases/postgresql12-server/ && make install clean BATCH=yes
 fi
-if [ ."$database_version" = ."11" ]; then
-	pkg install --yes postgresql11-server
-	#cd /usr/ports/databases/postgresql11-server/ && make install clean BATCH=yes
-fi
-if [ ."$database_version" = ."10" ]; then
-	pkg install --yes postgresql10-server
-	#cd /usr/ports/databases/postgresql10-server/ && make install clean BATCH=yes
-fi
-if [ ."$database_version" = ."9.6" ]; then
-	pkg install --yes postgresql96-server
-	#cd /usr/ports/databases/postgresql96-server/ && make install clean BATCH=yes
-fi
-if [ ."$database_version" = ."9.5" ]; then
-        pkg install --yes postgresql95-server
-	#cd /usr/ports/databases/postgresql95-server/ && make install clean BATCH=yes
-fi
-if [ ."$database_version" = ."9.4" ]; then
-        pkg install --yes postgresql94-server
-	#cd /usr/ports/databases/postgresql94-server/ && make install clean BATCH=yes
-fi
-if [ ."$database_version" = ."9.3" ]; then
-        pkg install --yes postgresql93-server
-	#cd /usr/ports/databases/postgresql93-server/ && make install clean BATCH=yes
-fi
 
 #enable postgres
 echo 'postgresql_enable=true' >> /etc/rc.conf
@@ -72,6 +52,9 @@ echo 'postgresql_enable=true' >> /etc/rc.conf
 /usr/local/etc/rc.d/postgresql initdb
 
 #start postgresql
+if [ ."$database_version" = ."16" ]; then
+	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data16 start
+fi
 if [ ."$database_version" = ."15" ]; then
 	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data15 start
 fi
@@ -84,24 +67,6 @@ fi
 if [ ."$database_version" = ."12" ]; then
 	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data12 start
 fi
-if [ ."$database_version" = ."11" ]; then
-	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data11 start
-fi
-if [ ."$database_version" = ."10" ]; then
-	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data10 start
-fi
-if [ ."$database_version" = ."9.6" ]; then
-	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data96 start
-fi
-if [ ."$database_version" = ."9.5" ]; then
-	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data95 start
-fi
-if [ ."$database_version" = ."9.4" ]; then
-	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data94 start
-fi
-if [ ."$database_version" = ."9.3" ]; then
-	sudo -u pgsql /usr/local/bin/pg_ctl -D /usr/local/pgsql/data start
-fi
 
 #restart the service
 service postgresql restart