diff options
| author | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-01-12 16:39:50 +0300 |
|---|---|---|
| committer | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2021-01-12 16:39:50 +0300 |
| commit | 582347219cf6a66dcf198a0400be91fc92d3f195 (patch) | |
| tree | 006eaa526d5eb052f4597a3f65d47bc79ac80d0d /conf | |
| parent | 368388807463db4a91bd46b1aedacf378e0cec71 (diff) | |
.D........ [ZBXNEXT-5759] improved configuration files
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/zabbix_proxy.conf | 7 | ||||
| -rw-r--r-- | conf/zabbix_server.conf | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf index 70a6e67884f..c5c327a2a0c 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -150,7 +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. +# 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. # # Mandatory: no # Default: @@ -158,8 +159,8 @@ LogFile=/tmp/zabbix_proxy.log ### Option: DBName # Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# For Oracle if the Net Service Name connection method is used, specify service name from tnsnames.ora or set to empty string. +# In case of Oracle if the Net Service Name connection method is used, specify service name from tnsnames.ora or +# set to empty string, also see TWO_TASK environment variable if DBName is empty # Warning: do not attempt to use the same database Zabbix server is using. # # Mandatory: yes diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf index 17c2eb4699d..bd97a268969 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -79,7 +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. +# 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. # # Mandatory: no # Default: @@ -87,7 +88,8 @@ LogFile=/tmp/zabbix_server.log ### Option: DBName # Database name. -# For Oracle if the Net Service Name connection method is used, specify service name from tnsnames.ora or set to empty string. +# In case of Oracle if the Net Service Name connection method is used, specify service name from tnsnames.ora or +# set to empty string, also see TWO_TASK environment variable if DBName is empty # # Mandatory: yes # Default: |