Bladeren bron

Move IGNORE_DEPENDS
Needed for PHP and FreeSWITCH as both use postgresql15-client by default

FusionPBX 11 maanden geleden
bovenliggende
commit
161cb556f0
3 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 5 5
      freebsd/install.sh
  2. 1 0
      freebsd/resources/postgresql.sh
  3. 0 1
      freebsd/resources/switch/package-release.sh

+ 5 - 5
freebsd/install.sh

@@ -42,16 +42,16 @@ if [ .$nginx_enabled = .'true' ]; then
 	resources/fusionpbx.sh
 fi
 
-#NGINX web server
-if [ .$nginx_enabled = .'true' ]; then
-	resources/nginx.sh
-fi
-
 #Postgres
 if [ .$database_enabled = .'true' ]; then
 	resources/postgresql.sh
 fi
 
+#NGINX web server
+if [ .$nginx_enabled = .'true' ]; then
+	resources/nginx.sh
+fi
+
 #FreeSWITCH
 if [ .$switch_enabled = .'true' ]; then
 	resources/switch.sh

+ 1 - 0
freebsd/resources/postgresql.sh

@@ -25,6 +25,7 @@ echo "Install PostgreSQL and create the database and users\n"
 
 #postgres install
 if [ ."$database_version" = ."16" ]; then
+	echo "IGNORE_DEPENDS=postgresql15-client" >> /usr/local/etc/pkg.conf
 	pkg install --yes postgresql16-server
 	#cd /usr/ports/databases/postgresql16-server/ && make install clean BATCH=yes
 fi

+ 0 - 1
freebsd/resources/switch/package-release.sh

@@ -17,7 +17,6 @@ echo "Installing the FreeSWITCH package"
 
 #install the package
 if [ .$switch_source = ."package" ]; then
-	echo "IGNORE_DEPENDS=postgresql15-client" >> /usr/local/etc/pkg.conf
 	pkg install --yes freeswitch
 fi
 if [ .$switch_source = ."port" ]; then