You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/10/21 01:06:34 UTC
[17/50] git commit: FC-140 - RBAC Overlay DB dir not setup
FC-140 - RBAC Overlay DB dir not setup
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/f0696467
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/f0696467
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/f0696467
Branch: refs/heads/master
Commit: f0696467b414b0b4921cc8a25852e4abed8aa7c2
Parents: 5f07c58
Author: Shawn McKinney <sh...@jts.us>
Authored: Mon Jun 30 08:18:03 2014 -0500
Committer: Shawn McKinney <sh...@jts.us>
Committed: Mon Jun 30 08:18:03 2014 -0500
----------------------------------------------------------------------
build.properties | 21 +++++++++++----------
build.xml | 6 ++++--
2 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f0696467/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 72cf883..0f4d3d1 100644
--- a/build.properties
+++ b/build.properties
@@ -204,8 +204,8 @@ dflt.checkpoint=checkpoint 64 5
# Option 2 - Debian 64-bit Silver:
platform=Debian-Silver-x86-64
-slapd.install=dpkg -i symas-openldap-silver.64_2.4.38-2_amd64.deb
-slapd.uninstall=dpkg -r symas-openldap-silver
+#slapd.install=dpkg -i symas-openldap-silver.64_2.4.38-2_amd64.deb
+#slapd.uninstall=dpkg -r symas-openldap-silver
install.image.dir=/home/smckinn/archives/debian64
slapd.module.dir=${openldap.root}/lib64/openldap
slapd.start=${openldap.root}/lib64/slapd -h ldap://${ldap.host}:${ldap.port} -f ${openldap.root}/etc/openldap/slapd.conf -F ${openldap.root}/etc/openldap
@@ -282,8 +282,8 @@ tomcat-realm.conf=<Realm className="org.openldap.sentry.tomcat.Tc7AccessMgrProxy
tomcat.dir=../apache-tomcat
#These props are for 'Builder' target and have been moved here: "${user.home}/build.properties"
-#openldap.install.artifact.dir=${basedir}
-openldap.install.artifact.dir=${basedir}/symas-openldap
+openldap.install.artifact.dir=${basedir}
+#openldap.install.artifact.dir=${basedir}/symas-openldap
#tomcat.image.dir=/home/smckinn/archives/tomcat/apache-tomcat-7.0.27
#maven.image.dir=/home/smckinn/archives/java/apache-maven-3.0.4
@@ -308,6 +308,7 @@ sessions.dn=cn=rbac
audit.dn=cn=audit
db.sess.dir=${db.root}/rbacsess
db.audit.dir=${db.root}/rbacaudit
+db.rbac.dir=${db.root}/rbacoverlay
db.bak.audit.dir=${db.root}/backup/rbacaudit
########################################################################
@@ -315,11 +316,11 @@ db.bak.audit.dir=${db.root}/backup/rbacaudit
########################################################################
# Use Fortress defined LDAP Group objectclass:
-group.objectclass=configGroup
-group.protocol=configProtocol
-group.properties=configParameter
+#group.objectclass=configGroup
+#group.protocol=configProtocol
+#group.properties=configParameter
# Use Guacamole defined LDAP Group objectclass:
-#group.objectclass=guacConfigGroup
-#group.protocol=guacConfigProtocol
-#group.properties=guacConfigParameter
\ No newline at end of file
+group.objectclass=guacConfigGroup
+group.protocol=guacConfigProtocol
+group.properties=guacConfigParameter
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f0696467/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2439ba3..d840de2 100644
--- a/build.xml
+++ b/build.xml
@@ -691,8 +691,9 @@
<replace file="${target.slapd.conf}" token="@PERMS_DN@" value="${perms.dn}"/>
<replace file="${target.slapd.conf}" token="@SUFFIX@" value="${suffix.dc}"/>
<replace file="${target.slapd.conf}" token="@SUFFIX_NAME@" value="${suffix.name}"/>
- <replace file="${target.slapd.conf}" token="@RBAC_DB_PATH@" value="${db.sess.dir}"/>
+ <replace file="${target.slapd.conf}" token="@RBACSESS_DB_PATH@" value="${db.sess.dir}"/>
<replace file="${target.slapd.conf}" token="@AUDIT_DB_PATH@" value="${db.audit.dir}"/>
+ <replace file="${target.slapd.conf}" token="@RBACOVERLAY_DB_PATH@" value="${db.rbac.dir}"/>
<replace file="${target.slapd.conf}" token="@RBAC_DN@" value="${rbac.dn}"/>
<replace file="${target.slapd.conf}" token="@SESSIONS_DN@" value="${sessions.dn}"/>
<replace file="${target.slapd.conf}" token="@AUDITS_DN@" value="${audit.dn}"/>
@@ -705,7 +706,8 @@
<mkdir dir="${db.sess.dir}"/>
<echo message="############### Create RBAC ACCEL OVERLAY audit folder ###############"/>
<mkdir dir="${db.audit.dir}"/>
-
+ <echo message="############### Create RBAC ACCEL OVERLAY rbac folder ###############"/>
+ <mkdir dir="${db.rbac.dir}"/>
<antcall target="copy-rbac-libs"></antcall>
</target>