Skip to content

Commit 06332fc

Browse files
ScIT-RaphaelScIT-Raphael
committed
Fix some minor issues.
1 parent 2ae8fa9 commit 06332fc

File tree

2 files changed

+148
-119
lines changed

2 files changed

+148
-119
lines changed

‎install/hst-install-debian.sh‎

Lines changed: 77 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -600,11 +600,38 @@ mv -f /root/.my.cnf $hst_backups/mysql > /dev/null 2>&1
600600
# Backup Hestia
601601
service hestia stop > /dev/null 2>&1
602602
cp -r $HESTIA/* $hst_backups/hestia > /dev/null 2>&1
603-
apt-get -y remove hestia hestia-nginx hestia-php > /dev/null 2>&1
604603
apt-get -y purge hestia hestia-nginx hestia-php > /dev/null 2>&1
605604
rm -rf $HESTIA > /dev/null 2>&1
606605

607606

607+
#----------------------------------------------------------#
608+
# Package Includes #
609+
#----------------------------------------------------------#
610+
611+
if [ "$multiphp" = 'yes' ]; then
612+
mph="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
613+
php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
614+
php5.6-soap php5.6-xml php5.6-zip php7.0-mbstring php7.0-bcmath
615+
php7.0-cli php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
616+
php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.1-mbstring
617+
php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd php7.1-intl
618+
php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml php7.1-zip
619+
php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm
620+
php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml
621+
php7.2-zip php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl
622+
php7.3-fpm php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
623+
php7.3-zip"
624+
software="$software $mph"
625+
fi
626+
627+
if [ "$phpfpm" = 'yes' ]; then
628+
fpm="php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl php7.3-fpm
629+
php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
630+
php7.3-zip"
631+
software="$software $fpm"
632+
fi
633+
634+
608635
#----------------------------------------------------------#
609636
# Package Excludes #
610637
#----------------------------------------------------------#
@@ -657,16 +684,23 @@ if [ "$mysql" = 'no' ]; then
657684
software=$(echo "$software" | sed -e 's/mariadb-server//')
658685
software=$(echo "$software" | sed -e 's/mariadb-client//')
659686
software=$(echo "$software" | sed -e 's/mariadb-common//')
660-
software=$(echo "$software" | sed -e 's/php7.3-mysql//')
661687
software=$(echo "$software" | sed -e 's/php-mysql//')
662-
software=$(echo "$software" | sed -e 's/phpMyAdmin//')
688+
software=$(echo "$software" | sed -e 's/php5.6-mysql//')
689+
software=$(echo "$software" | sed -e 's/php7.0-mysql//')
690+
software=$(echo "$software" | sed -e 's/php7.1-mysql//')
691+
software=$(echo "$software" | sed -e 's/php7.2-mysql//')
692+
software=$(echo "$software" | sed -e 's/php7.3-mysql//')
663693
software=$(echo "$software" | sed -e 's/phpmyadmin//')
664694
fi
665695
if [ "$postgresql" = 'no' ]; then
666696
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
667697
software=$(echo "$software" | sed -e 's/postgresql//')
668-
software=$(echo "$software" | sed -e 's/php7.3-pgsql//')
669698
software=$(echo "$software" | sed -e 's/php-pgsql//')
699+
software=$(echo "$software" | sed -e 's/php5.6-pgsql//')
700+
software=$(echo "$software" | sed -e 's/php7.0-pgsql//')
701+
software=$(echo "$software" | sed -e 's/php7.1-pgsql//')
702+
software=$(echo "$software" | sed -e 's/php7.2-pgsql//')
703+
software=$(echo "$software" | sed -e 's/php7.3-pgsql//')
670704
software=$(echo "$software" | sed -e 's/phppgadmin//')
671705
fi
672706
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
@@ -682,33 +716,6 @@ if [ "$phpfpm" = 'yes' ]; then
682716
fi
683717

684718

685-
#----------------------------------------------------------#
686-
# Package Includes #
687-
#----------------------------------------------------------#
688-
689-
if [ "$multiphp" = 'yes' ]; then
690-
mph="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
691-
php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
692-
php5.6-soap php5.6-xml php5.6-zip php7.0-mbstring php7.0-bcmath
693-
php7.0-cli php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
694-
php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.1-mbstring
695-
php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd php7.1-intl
696-
php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml php7.1-zip
697-
php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm
698-
php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml
699-
php7.2-zip php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl
700-
php7.3-fpm php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
701-
php7.3-zip"
702-
software="$software $mph"
703-
fi
704-
705-
if [ "$phpfpm" = 'yes' ]; then
706-
fpm="php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl php7.3-fpm
707-
php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
708-
php7.3-zip"
709-
software="$software $fpm"
710-
fi
711-
712719
#----------------------------------------------------------#
713720
# Install packages #
714721
#----------------------------------------------------------#
@@ -722,7 +729,7 @@ chmod a+x /usr/sbin/policy-rc.d
722729

723730
# Installing apt packages
724731
echo -ne "Install HestiaCP and all required packages, the process will take around 10-15 minutes... "
725-
apt-get -y -qq install $software >> $LOG &
732+
apt-get -y install $software > /dev/null 2>&1 &
726733
BACK_PID=$!
727734

728735
# Check if package installation is done, print a spinner
@@ -818,7 +825,7 @@ ln -s $HESTIA/log /var/log/hestia
818825
chmod 770 $HESTIA/data/sessions
819826

820827
# Generating Hestia configuration
821-
rm -f $HESTIA/conf/hestia.conf 2>/dev/null
828+
rm -f $HESTIA/conf/hestia.conf > /dev/null 2>&1
822829
touch $HESTIA/conf/hestia.conf
823830
chmod 660 $HESTIA/conf/hestia.conf
824831

@@ -929,7 +936,7 @@ sed -i 's/%domain%/It worked!/g' /var/www/index.html
929936
cp -rf $hestiacp/firewall $HESTIA/data/
930937

931938
# Configuring server hostname
932-
$HESTIA/bin/v-change-sys-hostname $servername 2>/dev/null
939+
$HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1
933940

934941
# Generating SSL certificate
935942
$HESTIA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
@@ -1073,7 +1080,7 @@ fi
10731080
# Configure PHP #
10741081
#----------------------------------------------------------#
10751082

1076-
ZONE=$(timedatectl 2>/dev/null|grep Timezone|awk '{print $2}')
1083+
ZONE=$(timedatectl > /dev/null 2>&1|grep Timezone|awk '{print $2}')
10771084
if [ -z "$ZONE" ]; then
10781085
ZONE='UTC'
10791086
fi
@@ -1084,17 +1091,21 @@ done
10841091

10851092

10861093
#----------------------------------------------------------#
1087-
# Configure VSFTPD #
1094+
# Configure Vsftpd #
10881095
#----------------------------------------------------------#
10891096

10901097
if [ "$vsftpd" = 'yes' ]; then
10911098
cp -f $hestiacp/vsftpd/vsftpd.conf /etc/
1099+
touch /var/log/vsftpd.log
1100+
chown root:adm /var/log/vsftpd.log
1101+
chmod 640 /var/log/vsftpd.log
1102+
touch /var/log/xferlog
1103+
chown root:adm /var/log/xferlog
1104+
chmod 640 /var/log/xferlog
10921105
update-rc.d vsftpd defaults
10931106
service vsftpd start
10941107
check_result $? "vsftpd start failed"
10951108

1096-
# To be deleted after release 0.9.8-18
1097-
echo "/sbin/nologin" >> /etc/shells
10981109
fi
10991110

11001111

@@ -1105,8 +1116,8 @@ fi
11051116
if [ "$proftpd" = 'yes' ]; then
11061117
echo "127.0.0.1 $servername" >> /etc/hosts
11071118
cp -f $hestiacp/proftpd/proftpd.conf /etc/proftpd/
1108-
update-rc.d proftpd defaults
1109-
service proftpd start
1119+
update-rc.d proftpd defaults > /dev/null 2>&1
1120+
service proftpd start >> $LOG
11101121
check_result $? "proftpd start failed"
11111122
fi
11121123

@@ -1159,34 +1170,36 @@ fi
11591170
# Update phpMyAdmin #
11601171
#----------------------------------------------------------#
11611172

1162-
# Display upgrade information
1163-
echo "Upgrade phpMyAdmin to v$pma_v..."
1173+
if [ "$mysql" = 'yes' ]; then
1174+
# Display upgrade information
1175+
echo "Upgrade phpMyAdmin to v$pma_v..."
11641176

1165-
# Download latest phpmyadmin release
1166-
wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
1177+
# Download latest phpmyadmin release
1178+
wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
11671179

1168-
# Unpack files
1169-
tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
1180+
# Unpack files
1181+
tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz
11701182

1171-
# Delete file to prevent error
1172-
if [ "$pma_v" = '4.8.4' ]; then
1173-
rm -fr /usr/share/phpmyadmin/doc/html
1174-
fi
1183+
# Delete file to prevent error
1184+
if [ "$pma_v" = '4.8.4' ]; then
1185+
rm -fr /usr/share/phpmyadmin/doc/html
1186+
fi
11751187

1176-
# Overwrite old files
1177-
cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
1188+
# Overwrite old files
1189+
cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin
11781190

1179-
# Set config and log directory
1180-
sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
1181-
sed -i "s|define('TEMP_DIR', './tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
1191+
# Set config and log directory
1192+
sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
1193+
sed -i "s|define('TEMP_DIR', './tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php
11821194

1183-
# Create temporary folder and change permission
1184-
mkdir /usr/share/phpmyadmin/tmp
1185-
chmod 777 /usr/share/phpmyadmin/tmp
1195+
# Create temporary folder and change permission
1196+
mkdir /usr/share/phpmyadmin/tmp
1197+
chmod 777 /usr/share/phpmyadmin/tmp
11861198

1187-
# Clear Up
1188-
rm -fr phpMyAdmin-$pma_v-all-languages
1189-
rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
1199+
# Clear Up
1200+
rm -fr phpMyAdmin-$pma_v-all-languages
1201+
rm -f phpMyAdmin-$pma_v-all-languages.tar.gz
1202+
fi
11901203

11911204

11921205
#----------------------------------------------------------#
@@ -1457,7 +1470,9 @@ fi
14571470
# Special thanks to Pavel Galkin (https://skurudo.ru)
14581471
# https://github.com/skurudo/phpmyadmin-fixer
14591472

1460-
source $hestiacp/phpmyadmin/pma.sh > /dev/null 2>&1
1473+
if [ "$mysql" = 'yes' ]; then
1474+
source $hestiacp/phpmyadmin/pma.sh > /dev/null 2>&1
1475+
fi
14611476

14621477

14631478
#----------------------------------------------------------#

0 commit comments

Comments
 (0)