Skip to content

Commit d6686bf

Browse files
committed
Supress spamassassin output.
1 parent 2b84c71 commit d6686bf

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

install/hst-install-ubuntu.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ mkdir spamassassin mysql postgresql hestia
497497

498498
# Backup nginx configuration
499499
service nginx stop > /dev/null 2>&1
500-
cp -r /etc/nginx/* $hst_backups/nginx >/dev/null 2>&1
500+
cp -r /etc/nginx/* $hst_backups/nginx > /dev/null 2>&1
501501

502502
# Backup Apache configuration
503503
service apache2 stop > /dev/null 2>&1
@@ -664,7 +664,7 @@ chmod a+x /usr/sbin/policy-rc.d
664664

665665
# Installing apt packages
666666
echo "We will now silently install all required packages. This process will take around 5-10 minutes..."
667-
apt-get -y install $software >/dev/null 2>&1
667+
apt-get -y install $software > /dev/null 2>&1
668668
check_result $? "apt-get install failed"
669669

670670
# Restoring autostart policy
@@ -1072,14 +1072,14 @@ if [ "$mysql" = 'yes' ]; then
10721072
chmod 600 /root/.my.cnf
10731073
if [ "$release" = '16.04' ]; then
10741074
mysql -e "DELETE FROM mysql.user WHERE User=''"
1075-
mysql -e "DROP DATABASE test" >/dev/null 2>&1
1075+
mysql -e "DROP DATABASE test" > /dev/null 2>&1
10761076
mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
10771077
mysql -e "DELETE FROM mysql.user WHERE user='' OR password='';"
10781078
mysql -e "FLUSH PRIVILEGES"
10791079
fi
10801080
if [ "$release" = '18.04' ]; then
10811081
mysql -e "DELETE FROM mysql.user WHERE User=''"
1082-
mysql -e "DROP DATABASE test" >/dev/null 2>&1
1082+
mysql -e "DROP DATABASE test" > /dev/null 2>&1
10831083
mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
10841084
mysql -e "DELETE FROM mysql.user WHERE user='';"
10851085
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$mpass';"
@@ -1254,7 +1254,7 @@ if [ "$spamd" = 'yes' ]; then
12541254
check_result $? "spamassassin start failed"
12551255
unit_files="$(systemctl list-unit-files |grep spamassassin)"
12561256
if [[ "$unit_files" =~ "disabled" ]]; then
1257-
systemctl enable spamassassin
1257+
systemctl enable spamassassin > dev/null 2>&1
12581258
fi
12591259
fi
12601260

@@ -1361,10 +1361,10 @@ source $hestiacp/phpmyadmin/pma.sh > /dev/null 2>&1
13611361
# Deleting old admin user
13621362
if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
13631363
chattr -i /home/admin/conf > /dev/null 2>&1
1364-
userdel -f admin >/dev/null 2>&1
1365-
chattr -i /home/admin/conf >/dev/null 2>&1
1366-
mv -f /home/admin $hst_backups/home/ >/dev/null 2>&1
1367-
rm -f /tmp/sess_* >/dev/null 2>&1
1364+
userdel -f admin > /dev/null 2>&1
1365+
chattr -i /home/admin/conf > /dev/null 2>&1
1366+
mv -f /home/admin $hst_backups/home/ > /dev/null 2>&1
1367+
rm -f /tmp/sess_* > /dev/null 2>&1
13681368
fi
13691369
if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
13701370
groupdel admin > /dev/null 2>&1

0 commit comments

Comments
 (0)