diff options
| author | Jurijs Klopovskis <jurijs.klopovskis@zabbix.com> | 2020-09-23 16:42:04 +0300 |
|---|---|---|
| committer | Jurijs Klopovskis <jurijs.klopovskis@zabbix.com> | 2020-09-23 16:42:04 +0300 |
| commit | 0f8153c7dc9e9d8c12a013e01322058bf80c4ba2 (patch) | |
| tree | 8b85a2982af376cd1797870d3c4772d0f416d9c4 /conf | |
| parent | 7e40f57b9e0170ea1ab2a253548d455383e080e1 (diff) | |
| parent | 45404e4c724f755851cf64cc89620be05ef0d97e (diff) | |
...G...... [ZBXNEXT-6171] merged additional changes
- d2c1c6224e handle chdir() error, do not print it to the log file
- 6427d950be renamed UserParameterPath to UserParameterDir
- other minor changes
Conflicts:
- fixed conflict in src/libs/zbxicmpping/icmpping.c
- removed ChangeLog.d/feature/ZBXNEXT-6171
- updated ChangeLog file directly
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/zabbix_agentd.conf | 6 | ||||
| -rw-r--r-- | conf/zabbix_agentd.win.conf | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf index 2513b2e9cd1..f03e1112752 100644 --- a/conf/zabbix_agentd.conf +++ b/conf/zabbix_agentd.conf @@ -330,15 +330,15 @@ Hostname=Zabbix server # Default: # UserParameter= -### Option: UserParameterPath +### Option: UserParameterDir # Directory to execute UserParameter commands from. Only one entry is allowed. # When executing UserParameter commands the agent will change the working directory to the one -# specified in the UserParameterPath option. +# specified in the UserParameterDir option. # This way UserParameter commands can be specified using the relative ./ prefix. # # Mandatory: no # Default: -# UserParameterPath= +# UserParameterDir= ####### LOADABLE MODULES ####### diff --git a/conf/zabbix_agentd.win.conf b/conf/zabbix_agentd.win.conf index 8155822d8dc..b8770735473 100644 --- a/conf/zabbix_agentd.win.conf +++ b/conf/zabbix_agentd.win.conf @@ -314,15 +314,15 @@ Hostname=Windows host # Default: # UserParameter= -### Option: UserParameterPath +### Option: UserParameterDir # Directory to execute UserParameter commands from. Only one entry is allowed. # When executing UserParameter commands the agent will change the working directory to the one -# specified in the UserParameterPath option. +# specified in the UserParameterDir option. # This way UserParameter commands can be specified using the relative ./ prefix. # # Mandatory: no # Default: -# UserParameterPath= +# UserParameterDir= ####### TLS-RELATED PARAMETERS ####### |