Просмотр исходного кода

Adjust v-list-sys-services to honor the changed fail2ban service name.
This commit fixes #804

Raphael Schneeberger 5 лет назад
Родитель
Сommit
a0c6f12889
2 измененных файлов с 7 добавлено и 1 удалено
  1. 2 0
      CHANGELOG.md
  2. 5 1
      bin/v-list-sys-services

+ 2 - 0
CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 ## [CURRENT] - Development
 ### Features
 - Added support for configuring individual TTL per DNS record. Thanks to @jaapmarcus
+- Added support for Ubuntu Server 20.04 LTS
 
 ### Bugfixes
 - Disable Apache2 Server Status Module by default.
@@ -20,6 +21,7 @@ All notable changes to this project will be documented in this file.
 - Don't calculate /home folder size in v-list-sys-info.
 - Cleanup temporary files when uploading custom SSL cert from WebUi.
 - Cleanup temporary files when adding/renewing letsencrypt SSL cert.
+- Adjust v-list-sys-services to honor the changed fail2ban service name.
 
 ## [1.1.1] - 2020-03-24 - Hotfix
 ### Features

+ 5 - 1
bin/v-list-sys-services

@@ -284,7 +284,11 @@ fi
 
 # Checking FIREWALL Fail2ban extention
 if [ ! -z "$FIREWALL_EXTENSION" ]; then
-    get_srv_state $FIREWALL_EXTENSION fail2ban-server script
+    if [ "$(lsb_release -s -r)" = "20.04" ]; then
+        get_srv_state $FIREWALL_EXTENSION f2b/server script
+    else
+        get_srv_state $FIREWALL_EXTENSION fail2ban-server script
+    fi
     data="$data\nNAME='$FIREWALL_EXTENSION' SYSTEM='brute-force monitor'"
     data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'"
 fi