Minor fixes to upgrade script (#3618)

install/deb/fail2ban/jail.local

@@ -45,6 +45,13 @@ action   = hestia[name=WEB]
 logpath  = /var/log/roundcube/errors.log
 maxretry = 5
 
+[phpmyadmin-auth]
+enabled  = true
+filter   = phpmyadmin-syslog
+action   = hestia[name=WEB]
+logpath  = /var/log/auth.log
+maxretry = 5
+
 [recidive]
 enabled  = true
 filter   = recidive
@@ -54,13 +61,6 @@ maxretry = 5
 findtime = 86400
 bantime  = 864000
 
-[phpmyadmin]
-enabled  = true
-filter   = phpmyadmin-syslog
-action   = hestia[name=WEB]
-logpath  = /var/log/auth.log
-maxretry = 5
-
 #Uncomment and add your IPs and or domains to the Whitelist
 #[DEFAULT]
 #ignoreip = 111.111.111.111 222.222.222.222 subdomain.example.tld example.tld 333.333.333.333

install/rpm/fail2ban/jail.local

@@ -45,6 +45,13 @@ action   = hestia[name=WEB]
 logpath  = /var/log/roundcube/errors
 maxretry = 5
 
+[phpmyadmin-auth]
+enabled  = true
+filter   = phpmyadmin-syslog
+action   = hestia[name=WEB]
+logpath  = /var/log/auth.log
+maxretry = 5
+
 [recidive]
 enabled  = true
 filter   = recidive

install/upgrade/versions/1.8.0.sh

@@ -25,7 +25,7 @@ upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
 
 if [ "$IMAP_SYSTEM" = "dovecot" ]; then
 	if ! grep -qw "^extra_groups = mail$" /etc/dovecot/conf.d/10-master.conf 2> /dev/null; then
-		sed -i "s/^service auth {/service auth {\n  extra_groups = mail/g" /etc/dovecot/conf.d/10-master.conf
+		sed -i "s/^service auth {/service auth {\n  extra_groups = mail\n/g" /etc/dovecot/conf.d/10-master.conf
 	fi
 
 	if [ -f /etc/dovecot/conf.d/90-sieve.conf ]; then
@@ -37,14 +37,8 @@ fi
 
 if [ -f /etc/fail2ban/jail.local ]; then
 	# Add phpmyadmin rule
-	if ! -qw "^[phpmyadmin]$" /etc/fail2ban/jail.local 2> /dev/null; then
-		echo "
-		[phpmyadmin]
-		enabled  = true
-		filter   = phpmyadmin-syslog
-		action   = hestia[name=WEB]
-		logpath  = /var/log/auth.log
-		maxretry = 5" >> /etc/fail2ban/jail.local
+	if ! -qw "^[phpmyadmin-auth]$" /etc/fail2ban/jail.local 2> /dev/null; then
+		sed -i '/\[recidive\]/i [phpmyadmin-auth]\nenabled  = true\nfilter   = phpmyadmin-syslog\naction   = hestia[name=WEB]\nlogpath  = /var/log/auth.log\nmaxretry = 5\n' /etc/fail2ban/jail.local
 	fi
 fi