Merge branch 'next'

[people/pmueller/ipfire-2.x.git] / config / zabbix_agentd / zabbix_agentd.conf

diff --git a/config/zabbix_agentd/zabbix_agentd.conf b/config/zabbix_agentd/zabbix_agentd.conf
index 07f71c1843c99bca887a77be279a7c8a5609b805..21b8e0122b3030562f5295ebad415cfebb752267 100644 (file)
--- a/config/zabbix_agentd/zabbix_agentd.conf
+++ b/config/zabbix_agentd/zabbix_agentd.conf
@@ -305,8 +305,12 @@ LoadModulePath=/usr/lib/zabbix
 
 ### Option: LoadModule
 #      Module to load at agent startup. Modules are used to extend functionality of the agent.
-#      Format: LoadModule=<module.so>
-#      The modules must be located in directory specified by LoadModulePath.
+#      Formats:
+#              LoadModule=<module.so>
+#              LoadModule=<path/module.so>
+#              LoadModule=</abs_path/module.so>
+#      Either the module must be located in directory specified by LoadModulePath or the path must precede the module name.
+#      If the preceding path is absolute (starts with '/') then LoadModulePath is ignored.
 #      It is allowed to include multiple LoadModule parameters.
 #
 # Mandatory: no
@@ -353,14 +357,14 @@ LoadModulePath=/usr/lib/zabbix
 # TLSCRLFile=
 
 ### Option: TLSServerCertIssuer
-#      Allowed server certificate issuer.
+#      Allowed server certificate issuer.
 #
 # Mandatory: no
 # Default:
 # TLSServerCertIssuer=
 
 ### Option: TLSServerCertSubject
-#      Allowed server certificate subject.
+#      Allowed server certificate subject.
 #
 # Mandatory: no
 # Default: