diff options
| author | Andrejs Tumilovics <andrejs.tumilovics@zabbix.com> | 2019-12-05 13:27:20 +0300 |
|---|---|---|
| committer | Andrejs Tumilovics <andrejs.tumilovics@zabbix.com> | 2019-12-05 13:27:20 +0300 |
| commit | c8546dd355a6299915ae22a254bacf7a5ad75c4a (patch) | |
| tree | c67918a84b207196ce1a9eaa0a1e3a29ea18c142 /conf | |
| parent | 649fc3fb1ae9e9e7c48ffcc4fe5757edcf12f7a3 (diff) | |
...G...... [ZBXNEXT-1085] changed AllowKey and DenyKey documentation order as suggested in review
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/zabbix_agentd.conf | 20 | ||||
| -rw-r--r-- | conf/zabbix_agentd.win.conf | 20 |
2 files changed, 18 insertions, 22 deletions
diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf index a79b1167b25..44d8130f13f 100644 --- a/conf/zabbix_agentd.conf +++ b/conf/zabbix_agentd.conf @@ -59,20 +59,21 @@ LogFile=/tmp/zabbix_agentd.log # Default: # SourceIP= -### Option: AllowKey -# Allow execution of item keys matching pattern. -# Multiple keys matching rules may be defined in combination with DenyKey. +### Option: DenyKey +# Deny execution of items keys matching pattern. +# Multiple keys matching rules may be defined in combination with AllowKey. # Key pattern is wildcard expression, which support "*" character to match any number of any characters in certain position. It might be used in both key name and key arguments. # Parameters are processed one by one according their appearance order. # If no AllowKey or DenyKey rules defined, all keys are allowed. # # Mandatory: no -# Default (last rule): -# AllowKey=* -### Option: DenyKey -# Deny execution of items keys matching pattern. -# Multiple keys matching rules may be defined in combination with AllowKey. +# Deny system.run requests +DenyKey=system.run[*] + +### Option: AllowKey +# Allow execution of item keys matching pattern. +# Multiple keys matching rules may be defined in combination with DenyKey. # Key pattern is wildcard expression, which support "*" character to match any number of any characters in certain position. It might be used in both key name and key arguments. # Parameters are processed one by one according their appearance order. # If no AllowKey or DenyKey rules defined, all keys are allowed. @@ -88,9 +89,6 @@ LogFile=/tmp/zabbix_agentd.log # Default: # EnableRemoteCommands=0 -# Deny system.run requests -DenyKey=system.run[*] - ### Option: LogRemoteCommands # Enable logging of executed shell commands as warnings. # 0 - disabled diff --git a/conf/zabbix_agentd.win.conf b/conf/zabbix_agentd.win.conf index 6160a151ed5..1d6532e0e91 100644 --- a/conf/zabbix_agentd.win.conf +++ b/conf/zabbix_agentd.win.conf @@ -52,20 +52,21 @@ LogFile=c:\zabbix_agentd.log # Default: # SourceIP= -### Option: AllowKey -# Allow execution of item keys matching pattern. -# Multiple keys matching rules may be defined in combination with DenyKey. +### Option: DenyKey +# Deny execution of items keys matching pattern. +# Multiple keys matching rules may be defined in combination with AllowKey. # Key pattern is wildcard expression, which support "*" character to match any number of any characters in certain position. It might be used in both key name and key arguments. # Parameters are processed one by one according their appearance order. # If no AllowKey or DenyKey rules defined, all keys are allowed. # # Mandatory: no -# Default (last rule): -# AllowKey=* -### Option: DenyKey -# Deny execution of items keys matching pattern. -# Multiple keys matching rules may be defined in combination with AllowKey. +# Deny system.run requests +DenyKey=system.run[*] + +### Option: AllowKey +# Allow execution of item keys matching pattern. +# Multiple keys matching rules may be defined in combination with DenyKey. # Key pattern is wildcard expression, which support "*" character to match any number of any characters in certain position. It might be used in both key name and key arguments. # Parameters are processed one by one according their appearance order. # If no AllowKey or DenyKey rules defined, all keys are allowed. @@ -81,9 +82,6 @@ LogFile=c:\zabbix_agentd.log # Default: # EnableRemoteCommands=0 -# Deny system.run requests -DenyKey=system.run[*] - ### Option: LogRemoteCommands # Enable logging of executed shell commands as warnings. # 0 - disabled |