directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [05/50] git commit: FC-134 - replace bootstrap props with group vals
Date Mon, 20 Oct 2014 23:06:22 GMT
FC-134 - replace bootstrap props with group vals


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/113be670
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/113be670
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/113be670

Branch: refs/heads/master
Commit: 113be6703be32c0d752e1d0ca6547273155a96cb
Parents: 1e8533b
Author: Shawn McKinney <shawn.mckinney@jts.us>
Authored: Sat Jun 14 15:26:28 2014 -0500
Committer: Shawn McKinney <shawn.mckinney@jts.us>
Committed: Sat Jun 14 15:26:28 2014 -0500

----------------------------------------------------------------------
 build.xml                                |  3 +++
 config/bootstrap/fortress.properties.src | 11 +++--------
 2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/113be670/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 86ca1a7..84be0cd 100644
--- a/build.xml
+++ b/build.xml
@@ -788,6 +788,9 @@
          <replace file="${dst.bootstrap.conf}" token="@ADMINPERMS_DN@" value="${adminperms.dn}"/>
          <replace file="${dst.bootstrap.conf}" token="@AUDITS_DN@" value="${audits.dn}"/>
          <replace file="${dst.bootstrap.conf}" token="@GROUPS_DN@" value="${groups.dn}"/>
+         <replace file="${dst.bootstrap.conf}" token="@GROUP_OBJECT_CLASS@" value="${group.objectclass}"/>
+         <replace file="${dst.bootstrap.conf}" token="@GROUP_PROTOCOL@" value="${group.protocol}"/>
+         <replace file="${dst.bootstrap.conf}" token="@GROUP_PROPERTIES@" value="${group.properties}"/>
 
 	     <copy file="${src.remote.conf}" tofile="${dst.remote.conf}"/>
          <replace file="${dst.remote.conf}" token="@SUFFIX@" value="${suffix}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/113be670/config/bootstrap/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/bootstrap/fortress.properties.src b/config/bootstrap/fortress.properties.src
index 308e9ad..f5ea519 100755
--- a/config/bootstrap/fortress.properties.src
+++ b/config/bootstrap/fortress.properties.src
@@ -144,14 +144,9 @@ ldap.sub.15=7e
 #regXSafetext=^A-Za-z0-9- .
 
 user.objectclass=inetOrgPerson
-group.objectclass=configGroup
-group.protocol=configProtocol
-group.properties=configParameter
-#group.objectclass=guacConfigGroup
-#group.protocol=guacConfigProtocol
-#group.properties=guacConfigParameter
-
-
+group.objectclass=@GROUP_OBJECT_CLASS@
+group.protocol=@GROUP_PROTOCOL@
+group.properties=@GROUP_PROPERTIES@
 crypto.prop=@CFG_CRYPTO_PROP@
 enable.audit=true
 clientside.sorting=true


Mime
View raw message