diff options
| author | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2021-01-13 18:55:25 +0300 |
|---|---|---|
| committer | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2021-01-13 18:55:25 +0300 |
| commit | 4982461200107de5278adf65425c8c61aed641f3 (patch) | |
| tree | 2dd96a26b7c17881cabfb500e16dff282452ab77 /conf | |
| parent | 524a748fe26aeb8a7f9fde80b2f578d53506b761 (diff) | |
.D........ [ZBXNEXT-5759] improved configuration files
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/zabbix_proxy.conf | 10 | ||||
| -rw-r--r-- | conf/zabbix_server.conf | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf index 6fdff2f4db0..7504b7828b3 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -150,8 +150,8 @@ LogFile=/tmp/zabbix_proxy.log # Database host name. # If set to localhost, socket is used for MySQL. # If set to empty string, socket is used for PostgreSQL. -# If set to empty string, the Net Service Name connection method is used to connect for Oracle, also see TNS_ADMIN -# environment variable to specify the directory where the tnsnames.ora file is located. +# If set to empty string, the Net Service Name connection method is used to connect to Oracle database; also see +# the TNS_ADMIN environment variable to specify the directory where the tnsnames.ora file is located. # # Mandatory: no # Default: @@ -160,8 +160,8 @@ LogFile=/tmp/zabbix_proxy.log ### Option: DBName # Database name. # For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# In case of Oracle if the Net Service Name connection method is used, specify service name from tnsnames.ora or -# set to empty string to use value from TWO_TASK environment variable. +# 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. # Warning: do not attempt to use the same database Zabbix server is using. # # Mandatory: yes @@ -202,6 +202,8 @@ 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 +# tnsnames.ora file will be used. The port number set here will be ignored. # # Mandatory: no # Default: diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf index bbe9c34a583..8a814884bae 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -79,8 +79,8 @@ LogFile=/tmp/zabbix_server.log # Database host name. # If set to localhost, socket is used for MySQL. # If set to empty string, socket is used for PostgreSQL. -# If set to empty string, the Net Service Name connection method is used to connect for Oracle, also see TNS_ADMIN -# environment variable to specify the directory where the tnsnames.ora file is located. +# If set to empty string, the Net Service Name connection method is used to connect to Oracle database; also see +# the TNS_ADMIN environment variable to specify the directory where the tnsnames.ora file is located. # # Mandatory: no # Default: @@ -88,8 +88,8 @@ LogFile=/tmp/zabbix_server.log ### Option: DBName # Database name. -# In case of Oracle if the Net Service Name connection method is used, specify service name from tnsnames.ora or -# set to empty string to use value from TWO_TASK environment variable. +# 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. # # Mandatory: yes # Default: @@ -130,6 +130,8 @@ 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 +# tnsnames.ora file will be used. The port number set here will be ignored. # # Mandatory: no # Range: 1024-65535 |