Skip to content

Commit 56e620a

Browse files
committed
Small fixes to ubuntu installer.
1 parent 5d237a9 commit 56e620a

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

install/hst-install-ubuntu.sh

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ cp -r /etc/apache2/* $hst_backups/apache2 > /dev/null 2>&1
510510
rm -f /etc/apache2/conf.d/* > /dev/null 2>&1
511511

512512
# Backup PHP-FPM configuration
513-
service php-fpm stop > /dev/null 2>&1
513+
service php*-fpm stop > /dev/null 2>&1
514514
cp -r /etc/php/* $hst_backups/php/ > /dev/null 2>&1
515515

516516
# Backup Bind configuration
@@ -566,15 +566,14 @@ if [ "$nginx" = 'no' ]; then
566566
software=$(echo "$software" | sed -e "s/^nginx//")
567567
fi
568568
if [ "$apache" = 'no' ]; then
569-
software=$(echo "$software" | sed -e "s/apache2 //")
569+
software=$(echo "$software" | sed -e "s/apache2//")
570570
software=$(echo "$software" | sed -e "s/apache2-utils//")
571571
software=$(echo "$software" | sed -e "s/apache2-suexec-custom//")
572572
software=$(echo "$software" | sed -e "s/apache2.2-common//")
573573
software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
574574
software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
575575
software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
576-
software=$(echo "$software" | sed -e "s/libapache2-mod-php7.0//")
577-
software=$(echo "$software" | sed -e "s/libapache2-mod-php5//")
576+
software=$(echo "$software" | sed -e "s/libapache2-mod-php7.2//")
578577
software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
579578
fi
580579
if [ "$vsftpd" = 'no' ]; then
@@ -609,17 +608,15 @@ if [ "$mysql" = 'no' ]; then
609608
software=$(echo "$software" | sed -e 's/mariadb-server//')
610609
software=$(echo "$software" | sed -e 's/mariadb-client//')
611610
software=$(echo "$software" | sed -e 's/mariadb-common//')
612-
software=$(echo "$software" | sed -e 's/php7.0-mysql//')
613-
software=$(echo "$software" | sed -e 's/php5-mysql//')
611+
software=$(echo "$software" | sed -e 's/php7.2-mysql//')
614612
software=$(echo "$software" | sed -e 's/php-mysql//')
615613
software=$(echo "$software" | sed -e 's/phpMyAdmin//')
616614
software=$(echo "$software" | sed -e 's/phpmyadmin//')
617615
fi
618616
if [ "$postgresql" = 'no' ]; then
619617
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
620618
software=$(echo "$software" | sed -e 's/postgresql//')
621-
software=$(echo "$software" | sed -e 's/php7.0-pgsql//')
622-
software=$(echo "$software" | sed -e 's/php5-pgsql//')
619+
software=$(echo "$software" | sed -e 's/php7.2-pgsql//')
623620
software=$(echo "$software" | sed -e 's/php-pgsql//')
624621
software=$(echo "$software" | sed -e 's/phppgadmin//')
625622
fi
@@ -1283,7 +1280,6 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
12831280
fi
12841281

12851282
mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql
1286-
php5enmod mcrypt 2>/dev/null
12871283
phpenmod mcrypt 2>/dev/null
12881284
if [ "$apache" = 'yes' ]; then
12891285
service apache2 restart

0 commit comments

Comments
 (0)