From 54fd880aa7f72a6e69a17d1e12d6ebb2b14b28c2 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Wed, 07 Mar 2007 17:49:04 +0000
Subject: [PATCH] Moving to STAF 3.2.1. the installer now checks that the ports opends will be configured to use are available or bails out.

---
 opends/tests/functional-tests/staf-installer/config.py.stubs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opends/tests/functional-tests/staf-installer/config.py.stubs b/opends/tests/functional-tests/staf-installer/config.py.stubs
index 430b5a1..6af52ca 100644
--- a/opends/tests/functional-tests/staf-installer/config.py.stubs
+++ b/opends/tests/functional-tests/staf-installer/config.py.stubs
@@ -17,12 +17,12 @@
 TESTS_FUNCTIONS_DIR         = '%s/functions' % TESTS_SHARED_DIR
 TESTS_DATA_DIR              = '%s/data' % TESTS_SHARED_DIR
 TMP_DATA_DIR                = '%s/functional-tests' % TMPDIR
-DIRECTORY_INSTANCE_DN       = 'cn=Directory Manager'
-DIRECTORY_INSTANCE_PSWD     = 'password'
+DIRECTORY_INSTANCE_DN       = '${opends.admin.dn}'
+DIRECTORY_INSTANCE_PSWD     = '${opends.admin.pwd}'
 DIRECTORY_INSTANCE_DIR      = '%s' % TMPDIR
 DIRECTORY_INSTANCE_HOST     = 'localhost'
-DIRECTORY_INSTANCE_PORT     = '1389'
-DIRECTORY_INSTANCE_SSL_PORT = '1636'
+DIRECTORY_INSTANCE_PORT     = '${opends.port.ldap}'
+DIRECTORY_INSTANCE_SSL_PORT = '${opends.port.ldaps}'
 DIRECTORY_INSTANCE_SFX      = 'dc=com'
 DIRECTORY_INSTANCE_BE       = 'userRoot'
 STAGED_DATA_DIR             = '%s/shared/data' % TMP_DATA_DIR

--
Gitblit v1.10.0