diff options
| author | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2021-01-14 18:29:28 +0300 |
|---|---|---|
| committer | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2021-01-14 18:29:28 +0300 |
| commit | fdc0574c066b8319d556724409f2f0e56af41191 (patch) | |
| tree | eb29a7bd91c61f4184d65cac5c4679e419f43259 /conf | |
| parent | 4982461200107de5278adf65425c8c61aed641f3 (diff) | |
.D........ [ZBXNEXT-5759] improved configuration files
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/zabbix_proxy.conf | 5 | ||||
| -rw-r--r-- | conf/zabbix_server.conf | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf index 7504b7828b3..8ba915f3d69 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -161,7 +161,8 @@ LogFile=/tmp/zabbix_proxy.log # Database name. # For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. # If the Net Service Name connection method is used to connect to Oracle database, specify the service name from -# tnsnames.ora or set to empty string; also see the TWO_TASK environment variable if DBName is set to empty string. +# the tnsnames.ora file or set to empty string; also see the TWO_TASK environment variable if DBName is set to +# empty string. # Warning: do not attempt to use the same database Zabbix server is using. # # Mandatory: yes @@ -202,7 +203,7 @@ DBUser=zabbix # Option: DBPort # Database port when not using local socket. Ignored for SQLite. -# If the Net Service Name connection method is used to connect to Oracle database, the port number from +# If the Net Service Name connection method is used to connect to Oracle database, the port number from the # tnsnames.ora file will be used. The port number set here will be ignored. # # Mandatory: no diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf index 8a814884bae..9dcab285436 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -89,7 +89,8 @@ LogFile=/tmp/zabbix_server.log ### Option: DBName # Database name. # If the Net Service Name connection method is used to connect to Oracle database, specify the service name from -# tnsnames.ora or set to empty string; also see the TWO_TASK environment variable if DBName is set to empty string. +# the tnsnames.ora file or set to empty string; also see the TWO_TASK environment variable if DBName is set to +# empty string. # # Mandatory: yes # Default: @@ -130,7 +131,7 @@ DBUser=zabbix ### Option: DBPort # Database port when not using local socket. -# If the Net Service Name connection method is used to connect to Oracle database, the port number from +# If the Net Service Name connection method is used to connect to Oracle database, the port number from the # tnsnames.ora file will be used. The port number set here will be ignored. # # Mandatory: no |