Fix minor bug in upgrade_phppgadmin (hestiacp#3450)

* Fix minor bug in upgrade_phppgadmin

[ -d /usr/share/phppgadmin ] || mkdir -p /usr/share/phppgadmin instead of
[ -d /usr/share/phpmyadmin ] || mkdir -p /usr/share/phpmyadmin

* Also add warning to fpm templates

* Remove not needed sed from script

Author: jaapmarcus

func/upgrade.sh

@@ -580,7 +580,7 @@ upgrade_phppgadmin() {
 		else
 			# Display upgrade information
 			echo "[ * ] Upgrading phppgadmin to version $pga_v..."
-			[ -d /usr/share/phpmyadmin ] || mkdir -p /usr/share/phpmyadmin
+			[ -d /usr/share/phppgadmin ] || mkdir -p /usr/share/phppgadmin
 			# Download latest phpMyAdmin release
 			wget --retry-connrefused --quiet https://github.com/hestiacp/phppgadmin/releases/download/v$pga_v/phppgadmin-v$pga_v.tar.gz
 			tar xzf phppgadmin-v$pga_v.tar.gz -C /usr/share/phppgadmin/

install/deb/php-fpm/multiphp.tpl

@@ -1,4 +1,9 @@
 ; origin-src: deb/php-fpm/multiphp.tpl
+;#=========================================================================#
+;# Default Web Domain Template                                             #
+;# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+;# https://hestiacp.com/docs/server-administration/web-templates.html      #
+;#=========================================================================#
 
 [%domain%]
 listen = /run/php/php%backend_version%-fpm-%domain%.sock

install/deb/templates/web/php-fpm/default.tpl

@@ -1,4 +1,11 @@
 ; origin-src: deb/templates/web/php-fpm/default.tpl
+;#=========================================================================#
+;# Default Web Domain Template                                             #
+;# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+;# https://hestiacp.com/docs/server-administration/web-templates.html      #
+;#=========================================================================#
+
+
 
 [%backend%]
 listen = /run/php/php%backend_version%-fpm-%domain%.sock

install/deb/templates/web/php-fpm/no-php.tpl

@@ -1,4 +1,9 @@
 ; origin-src: deb/templates/web/php-fpm/no-php.tpl
+;#=========================================================================#
+;# Default Web Domain Template                                             #
+;# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+;# https://hestiacp.com/docs/server-administration/web-templates.html      #
+;#=========================================================================#
 
 ;[%backend%]
 ;listen = /run/php/%backend%.sock
@@ -24,4 +29,4 @@
 ;env[PATH] = /usr/local/bin:/usr/bin:/bin
 ;env[TMP] = /home/%user%/tmp
 ;env[TMPDIR] = /home/%user%/tmp
-;env[TEMP] = /home/%user%/tmp
+;env[TEMP] = /home/%user%/tmp

install/deb/templates/web/php-fpm/socket.tpl

@@ -1,4 +1,9 @@
 ; origin-src: deb/templates/web/php-fpm/socket.tpl
+;#=========================================================================#
+;# Default Web Domain Template                                             #
+;# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+;# https://hestiacp.com/docs/server-administration/web-templates.html      #
+;#=========================================================================#
 
 [%backend%]
 listen = /run/php/%backend%.sock
@@ -24,4 +29,4 @@ env[HOSTNAME] = $HOSTNAME
 env[PATH] = /usr/local/bin:/usr/bin:/bin
 env[TMP] = /home/%user%/tmp
 env[TMPDIR] = /home/%user%/tmp
-env[TEMP] = /home/%user%/tmp
+env[TEMP] = /home/%user%/tmp

install/hst-install-debian.sh

@@ -918,7 +918,6 @@ if [ "$postgresql" = 'no' ]; then
 	software=$(echo "$software" | sed -e "s/postgresql-contrib//")
 	software=$(echo "$software" | sed -e "s/postgresql//")
 	software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
-	software=$(echo "$software" | sed -e "s/phppgadmin//")
 fi
 if [ "$fail2ban" = 'no' ]; then
 	software=$(echo "$software" | sed -e "s/fail2ban//")

install/hst-install-ubuntu.sh

@@ -900,12 +900,6 @@ if [ "$postgresql" = 'no' ]; then
 	software=$(echo "$software" | sed -e "s/postgresql-contrib//")
 	software=$(echo "$software" | sed -e "s/postgresql//")
 	software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
-	if [ "$multiphp" = 'yes' ]; then
-		for v in "${multiphp_v[@]}"; do
-			software=$(echo "$software" | sed -e "s/php$v-pgsql//")
-		done
-	fi
-	software=$(echo "$software" | sed -e "s/phppgadmin//")
 fi
 if [ "$fail2ban" = 'no' ]; then
 	software=$(echo "$software" | sed -e "s/fail2ban//")