Browse Source

Small change at clamav start and log output.

Raphael Schneeberger 7 years ago
parent
commit
9eb44a0135
2 changed files with 8 additions and 10 deletions
  1. 2 3
      install/hst-install-debian.sh
  2. 6 7
      install/hst-install-ubuntu.sh

+ 2 - 3
install/hst-install-debian.sh

@@ -1235,10 +1235,9 @@ if [ "$clamd" = 'yes' ]; then
             /lib/systemd/system/clamav-daemon.service
         systemctl daemon-reload
     fi
-    service clamav-daemon start
     echo "Updating ClamAV..."
-    /usr/bin/freshclam  > /dev/null 2>&1
-    service clamav-daemon restart
+    /usr/bin/freshclam > /dev/null 2>&1
+    service clamav-daemon start
     check_result $? "clamav-daeom start failed"
 fi
 

+ 6 - 7
install/hst-install-ubuntu.sh

@@ -266,7 +266,7 @@ fi
 # Check if apt-transport-https is installed
 if [ ! -e '/usr/lib/apt/methods/https' ]; then
     echo "Install missing apt-transport-https..."
-    apt-get -y install apt-transport-https  > /dev/null 2>&1
+    apt-get -y install apt-transport-https > /dev/null 2>&1
     check_result $? "Can't install apt-transport-https"
 fi
 
@@ -969,8 +969,8 @@ if [ "$apache" = 'yes'  ]; then
     service apache2 start > /dev/null 2>&1
     check_result $? "apache2 start failed"
 else
-    update-rc.d apache2 disable  > /dev/null 2>&1
-    service apache2 stop  > /dev/null 2>&1
+    update-rc.d apache2 disable > /dev/null 2>&1
+    service apache2 stop > /dev/null 2>&1
 fi
 
 
@@ -1214,10 +1214,9 @@ if [ "$clamd" = 'yes' ]; then
     gpasswd -a clamav Debian-exim > /dev/null 2>&1
     cp -f $hestiacp/clamav/clamd.conf /etc/clamav/
     update-rc.d clamav-daemon defaults
-    service clamav-daemon start
     echo "Updating ClamAV..."
-    /usr/bin/freshclam  > /dev/null 2>&1
-    service clamav-daemon restart
+    /usr/bin/freshclam > /dev/null 2>&1
+    service clamav-daemon start
     check_result $? "clamav-daemon start failed"
 fi
 
@@ -1330,7 +1329,7 @@ fi
 # Special thanks to Pavel Galkin (https://skurudo.ru)
 # https://github.com/skurudo/phpmyadmin-fixer
 
-source $hestiacp/phpmyadmin/pma.sh  > /dev/null 2>&1
+source $hestiacp/phpmyadmin/pma.sh > /dev/null 2>&1
 
 
 #----------------------------------------------------------#