about-me: Improve tag detection

Linuxfabrik · May 11, 2024 · 1d2fd44 · 1d2fd44
1 parent 7cc5c10
commit 1d2fd44
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/check-plugins/about-me/about-me b/check-plugins/about-me/about-me
@@ -40,7 +40,7 @@ except ImportError:
 
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2024051101'
+__version__ = '2024051102'
 
 DESCRIPTION = 'Provides a quick overview of host dimensions and software.'
 
@@ -296,7 +296,7 @@ def get_lftags():
         {'sw': 'coturn', 'package': ['coturn'], 'expr': [run_cmd('systemctl is-active coturn.service')]}, # pylint: disable=C0301
         # {'sw': 'DHCP Client', 'package': [], 'expr': []}, # pylint: disable=C0301
         {'sw': 'Docker', 'package': ['docker-ce'], 'expr': [os.path.isfile('/etc/docker/daemon.json')]}, # pylint: disable=C0301
-        {'sw': 'Duplicity', 'package': ['duplicity'], 'expr': [os.path.isfile('/usr/local/bin/duplicity')]}, # pylint: disable=C0301
+        {'sw': 'Duplicity', 'package': [], 'expr': [run_cmd('systemctl is-active duba.timer', ignore_output=True)]}, # pylint: disable=C0301
         {'sw': 'Elasticsearch', 'package': [], 'expr': [os.path.isfile('/usr/share/elasticsearch/bin/elasticsearch')]}, # pylint: disable=C0301
         {'sw': 'Exim4', 'package': ['exim'], 'expr': []}, # pylint: disable=C0301
         {'sw': 'Fail2Ban', 'package': ['fail2ban'], 'expr': [os.path.isfile('/usr/bin/fail2ban-server')]}, # pylint: disable=C0301
@@ -362,7 +362,7 @@ def get_lftags():
         # {'sw': 'MySQL Security', 'package': [], 'expr': []}, # pylint: disable=C0301
         {'sw': 'Nextcloud', 'package': [], 'expr': [os.path.isdir('/var/www/html/nextcloud'), os.path.isdir('/var/www/nextcloud'), os.path.isfile('/var/www/html/nextcloud/occ')]}, # pylint: disable=C0301
         {'sw': 'NFS Server', 'package': [], 'expr': [run_cmd('systemctl is-active nfs-server.service', ignore_output=True)]}, # pylint: disable=C0301
-        {'sw': 'Nginx', 'package': ['nginx'], 'expr': [os.path.isdir('/etc/nginx')]}, # pylint: disable=C0301
+        {'sw': 'Nginx', 'package': ['nginx'], 'expr': []}, # pylint: disable=C0301
         {'sw': 'NodeBB', 'package': [], 'expr': [os.path.isdir('/opt/nodebb')]}, # pylint: disable=C0301
         {'sw': 'NTPd', 'package': [], 'expr': [run_cmd('ntpq -c version', ignore_output=True)]}, # pylint: disable=C0301
         {'sw': 'OnlyOffice', 'package': [], 'expr': [os.path.isdir('/var/log/onlyoffice')]}, # pylint: disable=C0301
@@ -389,9 +389,9 @@ def get_lftags():
         {'sw': 'Redis', 'package': ['redis'], 'expr': [os.path.isfile('/usr/bin/redis-cli'), run_cmd('redis-server --version', ignore_output=True)]}, # pylint: disable=C0301
         {'sw': 'restic', 'package': ['restic'], 'expr': [run_cmd('restic version', ignore_output=True)]}, # pylint: disable=C0301
         {'sw': 'Rocket.Chat', 'package': [], 'expr': [os.path.isdir('/opt/Rocket.Chat'), os.path.isdir('/opt/rocket.chat')]}, # pylint: disable=C0301
-        {'sw': 'rsyncd', 'package': ['rsync'], 'expr': [run_cmd('systemctl is-active rsyncd.service', ignore_output=True)]}, # pylint: disable=C0301
+        {'sw': 'rsyncd', 'package': [], 'expr': [run_cmd('systemctl is-active rsyncd.service', ignore_output=True)]}, # pylint: disable=C0301
         # {'sw': 'SafeNet HSM', 'package': [], 'expr': []}, # pylint: disable=C0301
-        {'sw': 'Samba', 'package': ['samba'], 'expr': [os.path.isfile('/etc/samba/smb.conf'), run_cmd('smbd --version', ignore_output=True)]}, # pylint: disable=C0301
+        {'sw': 'Samba', 'package': [], 'expr': [run_cmd('systemctl is-active smb.service', ignore_output=True)]}, # pylint: disable=C0301
         {'sw': 'snmpd', 'package': ['net-snmp'], 'expr': [os.path.isfile('/etc/snmp/snmpd.conf'),run_cmd('systemctl is-active snmpd.service', ignore_output=True)]}, # pylint: disable=C0301
         {'sw': 'Splunk', 'package': [], 'expr': [run_cmd('systemctl is-active splunk.service', ignore_output=True)]}, # pylint: disable=C0301
         # {'sw': 'Starface PBX', 'package': [], 'expr': []}, # pylint: disable=C0301