diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-08-24 10:42:32 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-08-24 10:42:52 +0300 |
| commit | f254926480ddc73df76c3ddd8f5e475473a07ecf (patch) | |
| tree | cba3c32c4926690c5194e4f0e8639fe86f0b25b0 /build.xml | |
| parent | ff295e73f12fb622550929a3b702cac39087ef9c (diff) | |
.......... [ZBXNEXT-686] improved SAML configuration
(cherry picked from commit 146855bff3468a64e58e105a8e061b1789d1fde2)
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/build.xml b/build.xml index ded4dde6a6c..02a1ac68dd3 100644 --- a/build.xml +++ b/build.xml @@ -16,6 +16,8 @@ <target name="create-configs" depends="init-common"> <property name="url" value="${URL}"/> + <property name="screenshot_dir" value="${SCREENSHOT_DIR}"/> + <property name="screenshot_url" value="${SCREENSHOT_URL}"/> <property name="dbtype" value="${DBTYPE}"/> <property name="dbhost" value="${DBHOST}"/> <property name="dbname" value="${DBNAME}"/> @@ -34,10 +36,10 @@ <!-- Create bootstrap.php --> <copy overwrite="true" file="ui/tests/bootstrap.php.template" tofile="ui/tests/bootstrap.php"/> - <replace file="ui/tests/bootstrap.php" token="{URL}" value="${env.WORKSPACE_URL}${url}"/> + <replace file="ui/tests/bootstrap.php" token="{URL}" value="${url}"/> <replace file="ui/tests/bootstrap.php" token="{BASEDIR}" value="${basedir}"/> - <replace file="ui/tests/bootstrap.php" token="{SCREENSHOT_DIR}" value="${env.SCREENSHOT_DIR}"/> - <replace file="ui/tests/bootstrap.php" token="{SCREENSHOT_URL}" value="${env.SCREENSHOT_URL}"/> + <replace file="ui/tests/bootstrap.php" token="{SCREENSHOT_DIR}" value="${screenshot_dir}"/> + <replace file="ui/tests/bootstrap.php" token="{SCREENSHOT_URL}" value="${screenshot_url}"/> <replace file="ui/tests/bootstrap.php" token="{BINARY_DIR}" value="${basedir}/sbin/"/> <replace file="ui/tests/bootstrap.php" token="{CONFIG_SOURCE_DIR}" value="${basedir}/conf/"/> <replace file="ui/tests/bootstrap.php" token="{CONFIG_DIR}" value="${basedir}/etc/"/> @@ -59,6 +61,7 @@ <target name="create-saml-configs"> <property name="phpunit_simplesaml_baseurl" value="${PHPUNIT_SIMPLESAML_BASEURL}"/> <property name="phpunit_sp_entity_id" value="${PHPUNIT_SP_ENTITY_ID}"/> + <property name="url" value="${URL}"/> <!-- SAML settings --> <replace file="ui/tests/bootstrap.php" token="'PHPUNIT_SAML_TESTS_ENABLED', false" value="'PHPUNIT_SAML_TESTS_ENABLED', true"/> @@ -68,6 +71,11 @@ <replace file="ui/tests/bootstrap.php" token="{PHPUNIT_SP_ENTITY_ID}" value="${phpunit_sp_entity_id}"/> <!-- Download SAML X509 certificates --> <get src="${phpunit_simplesaml_baseurl}/module.php/saml/idp/certs.php/idp.crt" dest="ui/conf/certs"/> + + <copy overwrite="true" file="${SIMPLESAMLPHP_CFG_FILE}.template" tofile="${SIMPLESAMLPHP_CFG_FILE}"/> + <replace file="${SIMPLESAMLPHP_CFG_FILE}" token="{ENTITY_ID}" value="${phpunit_sp_entity_id}"/> + <replace file="${SIMPLESAMLPHP_CFG_FILE}" token="{ASSERTION_CONSUMER_SERVICE}" value="${url}index_sso.php?acs"/> + <replace file="${SIMPLESAMLPHP_CFG_FILE}" token="{SINGLE_LOGOUT_SERVICE}" value="${url}index_sso.php?sls"/> </target> <target name="init-integration"> |