Merge branch 'master' into patch-4

Author: xenadmin

zabbix/files/default/etc/zabbix/zabbix_proxy.conf.jinja

@@ -1134,4 +1134,4 @@ LoadModule={{ loadmodule }}
 {% if settings.get('listenbacklog', defaults.get('listenbacklog', False)) %}ListenBacklog={{ settings.get('listenbacklog', defaults.listenbacklog) }}{% endif %}
 {% endif %}
 
-{{ settings.get('extra_conf','') }}
+{{ settings.get('extra_conf','') }}

zabbix/osfingermap.yaml

@@ -28,6 +28,9 @@ Debian-8:
   repo_aptkey: true
 
 # os: Ubuntu
+Ubuntu-24.04:
+  repo_signedby: signedby=/etc/apt/keyrings/zabbix.gpg
+  repo_aptkey: false
 Ubuntu-22.04:
   repo_signedby: signedby=/etc/apt/keyrings/zabbix.gpg
   repo_aptkey: false