diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2022-06-14 09:33:08 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2022-06-14 09:33:23 +0300 |
| commit | c642a6e0dfdac7a72484b8dbd304b5964969a4eb (patch) | |
| tree | bf92834b7a66d6f119e639c6570ad543b8af8620 | |
| parent | 6fd981ca03f0ede811b06b1549427fb9625fed3c (diff) | |
.......... [ZBXNEXT-686] added DBPORT configuration parameter for api, frontend and integration tests
(cherry picked from commit a843b422dc405711a0694589bd605057dda7a547)
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | ui/tests/templates/zabbix.conf.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build.xml b/build.xml index ce9d638eb7f..27c79d89103 100644 --- a/build.xml +++ b/build.xml @@ -17,6 +17,7 @@ <target name="create-frontend-configs"> <property name="dbtype" value="${DBTYPE}"/> <property name="dbhost" value="${DBHOST}"/> + <property name="dbport" value="${DBPORT}"/> <property name="dbname" value="${DBNAME}"/> <property name="dbuser" value="${DBUSER}"/> <property name="dbpassword" value="${DBPASSWORD}"/> @@ -27,6 +28,7 @@ <copy overwrite="true" file="ui/tests/templates/zabbix.conf.php" tofile="ui/conf/zabbix.conf.php"/> <replace file="ui/conf/zabbix.conf.php" token="{DBTYPE}" value="${dbtype}"/> <replace file="ui/conf/zabbix.conf.php" token="{DBHOST}" value="${dbhost}"/> + <replace file="ui/conf/zabbix.conf.php" token="{DBPORT}" value="${dbport}"/> <replace file="ui/conf/zabbix.conf.php" token="{DBNAME}" value="${dbname}"/> <replace file="ui/conf/zabbix.conf.php" token="{DBUSER}" value="${dbuser}"/> <replace file="ui/conf/zabbix.conf.php" token="{DBPASSWORD}" value="${dbpassword}"/> diff --git a/ui/tests/templates/zabbix.conf.php b/ui/tests/templates/zabbix.conf.php index 23eb8a125a5..deb90d1925f 100644 --- a/ui/tests/templates/zabbix.conf.php +++ b/ui/tests/templates/zabbix.conf.php @@ -4,7 +4,7 @@ global $DB; $DB['TYPE'] = '{DBTYPE}'; $DB['SERVER'] = '{DBHOST}'; -$DB['PORT'] = '0'; +$DB['PORT'] = {DBPORT}; $DB['DATABASE'] = '{DBNAME}'; $DB['USER'] = '{DBUSER}'; $DB['PASSWORD'] = '{DBPASSWORD}'; |