Browse Source

DebianInstaller: Fix missing auth.log which

Fail2ban cannot start and installer exits

Sftp system was enabled out of order
Robert Zollner 6 years ago
parent
commit
4cf01b8bda
2 changed files with 16 additions and 10 deletions
  1. 14 8
      install/hst-install-debian.sh
  2. 2 2
      install/hst-install-ubuntu.sh

+ 14 - 8
install/hst-install-debian.sh

@@ -50,7 +50,7 @@ else
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
         e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
         e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
         bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
         bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
-        unrar-free vim-common acl sysstat"
+        unrar-free vim-common acl sysstat rsyslog"
 fi
 fi
 
 
 # Defining help function
 # Defining help function
@@ -1314,12 +1314,12 @@ fi
 
 
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#
-#                    Update phpMyAdmin                     #
+#                    Configure phpMyAdmin                  #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 if [ "$mysql" = 'yes' ]; then
 if [ "$mysql" = 'yes' ]; then
     # Display upgrade information
     # Display upgrade information
-    echo "Upgrade phpMyAdmin to v$pma_v..."
+    echo "Installing phpMyAdmin version v$pma_v..."
 
 
     # Download latest phpmyadmin release
     # Download latest phpmyadmin release
     wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
     wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
@@ -1580,6 +1580,12 @@ if [ "$fail2ban" = 'yes' ]; then
         fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local
         sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local
     fi 
     fi 
+    if [ ! -e /var/log/auth.log ]; then
+        # Debian workaround: auth logging was moved to systemd
+        touch /var/log/auth.log
+        chmod 640 /var/log/auth.log
+        chown root:adm /var/log/auth.log
+    fi
     update-rc.d fail2ban defaults
     update-rc.d fail2ban defaults
     service fail2ban start
     service fail2ban start
     check_result $? "fail2ban start failed"
     check_result $? "fail2ban start failed"
@@ -1625,16 +1631,16 @@ if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
     groupdel admin > /dev/null 2>&1
     groupdel admin > /dev/null 2>&1
 fi
 fi
 
 
+# Enable sftp jail
+$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
+check_result $? "can't enable sftp jail"
+
 # Adding Hestia admin account
 # Adding Hestia admin account
 $HESTIA/bin/v-add-user admin $vpass $email default System Administrator
 $HESTIA/bin/v-add-user admin $vpass $email default System Administrator
 check_result $? "can't create admin user"
 check_result $? "can't create admin user"
 $HESTIA/bin/v-change-user-shell admin nologin
 $HESTIA/bin/v-change-user-shell admin nologin
 $HESTIA/bin/v-change-user-language admin $lang
 $HESTIA/bin/v-change-user-language admin $lang
 
 
-# Enable sftp jail
-$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
-check_result $? "can't enable sftp jail"
-
 # Roundcube permissions fix
 # Roundcube permissions fix
 if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
 if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
     if [ ! -d "/var/log/roundcube" ]; then
     if [ ! -d "/var/log/roundcube" ]; then
@@ -1646,7 +1652,7 @@ fi
 # Configuring system IPs
 # Configuring system IPs
 $HESTIA/bin/v-update-sys-ip > /dev/null 2>&1
 $HESTIA/bin/v-update-sys-ip > /dev/null 2>&1
 
 
-# Get main ip
+# Get main IP
 ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
 ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
 local_ip=$ip
 local_ip=$ip
 
 

+ 2 - 2
install/hst-install-ubuntu.sh

@@ -1279,12 +1279,12 @@ fi
 
 
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#
-#                    Update phpMyAdmin                     #
+#                    Configure phpMyAdmin                     #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
 if [ "$mysql" = 'yes' ]; then
 if [ "$mysql" = 'yes' ]; then
     # Display upgrade information
     # Display upgrade information
-    echo "Upgrade phpMyAdmin to v$pma_v..."
+    echo "Installing phpMyAdmin version v$pma_v..."
 
 
     # Download latest phpmyadmin release
     # Download latest phpmyadmin release
     wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz
     wget --quiet https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz