You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/03/28 17:54:57 UTC
[1/5] incubator-guacamole-manual git commit: GUACAMOLE-101: Add
documentation for new user and connection filter properties.
Repository: incubator-guacamole-manual
Updated Branches:
refs/heads/master 887b2f79d -> 6012d7729
GUACAMOLE-101: Add documentation for new user and connection filter properties.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/1b6fdca8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/1b6fdca8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/1b6fdca8
Branch: refs/heads/master
Commit: 1b6fdca8f138a4a923fc8a791bd28e1dc5f9a5b3
Parents: 887b2f7
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Mar 20 22:45:48 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Mar 28 12:44:25 2017 -0400
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/1b6fdca8/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index 4e32267..5d37c83 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -395,6 +395,24 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
aliases.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><property>ldap-user-search-filter</property></term>
+ <listitem>
+ <para>The search filter used to query the LDAP tree for users that
+ can log into and be granted privileges in Guacamole. <emphasis>If
+ this property is omitted the default of (objectClass=*) will be used.
+ </emphasis></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><property>ldap-connection-search-filter</property></term>
+ <listitem>
+ <para>The search filter used to query the LDAP tree for connections that
+ can be accessed from Guacamole. <emphasis>If this property is omitted
+ the default of (objectClass=guacConfigGroup) will be used.
+ </emphasis></para>
+ </listitem>
+ </varlistentry>
</variablelist>
<para>Again, even if the defaults are sufficient for the other properties, <emphasis>you
must still specify the <property>ldap-user-base-dn</property>
[4/5] incubator-guacamole-manual git commit: GUACAMOLE-101: Move new
parameter documentation to more appropriate location in list of parameters.
Posted by mj...@apache.org.
GUACAMOLE-101: Move new parameter documentation to more appropriate location in list of parameters.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/d556bac8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/d556bac8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/d556bac8
Branch: refs/heads/master
Commit: d556bac8b3bb81f796ad77240fbcb1ff7b8bddf7
Parents: 840bc80
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Mar 28 13:20:41 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Mar 28 13:20:41 2017 -0400
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/d556bac8/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index ab539a8..7e1fdcd 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -357,6 +357,15 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
</listitem>
</varlistentry>
<varlistentry>
+ <term><property>ldap-user-search-filter</property></term>
+ <listitem>
+ <para>The search filter used to query the LDAP tree for users that
+ can log into and be granted privileges in Guacamole. <emphasis>If
+ this property is omitted the default of "(objectClass=*)" will be used.
+ </emphasis></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><property>ldap-config-base-dn</property></term>
<listitem>
<para>The base of the DN for all Guacamole configurations. <emphasis>This
@@ -395,15 +404,6 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
aliases.</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><property>ldap-user-search-filter</property></term>
- <listitem>
- <para>The search filter used to query the LDAP tree for users that
- can log into and be granted privileges in Guacamole. <emphasis>If
- this property is omitted the default of "(objectClass=*)" will be used.
- </emphasis></para>
- </listitem>
- </varlistentry>
</variablelist>
<para>Again, even if the defaults are sufficient for the other properties, <emphasis>you
must still specify the <property>ldap-user-base-dn</property>
[5/5] incubator-guacamole-manual git commit: GUACAMOLE-101: Merge
documentation for new "ldap-user-search-filter" property.
Posted by mj...@apache.org.
GUACAMOLE-101: Merge documentation for new "ldap-user-search-filter" property.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/6012d772
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/6012d772
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/6012d772
Branch: refs/heads/master
Commit: 6012d7729fa6ed1ec8d2dfc255aae071e32aeee0
Parents: 887b2f7 d556bac
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Mar 28 10:49:36 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Mar 28 10:49:36 2017 -0700
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
[2/5] incubator-guacamole-manual git commit: GUACAMOLE-101: Add
quotations marks around literal value.
Posted by mj...@apache.org.
GUACAMOLE-101: Add quotations marks around literal value.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/840bc80a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/840bc80a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/840bc80a
Branch: refs/heads/master
Commit: 840bc80a7839a524c4e4b06bd205ecc0eeb70380
Parents: e23f09e
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Mar 28 11:46:24 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Mar 28 12:44:31 2017 -0400
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/840bc80a/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index e9191cb..ab539a8 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -400,7 +400,7 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
<listitem>
<para>The search filter used to query the LDAP tree for users that
can log into and be granted privileges in Guacamole. <emphasis>If
- this property is omitted the default of (objectClass=*) will be used.
+ this property is omitted the default of "(objectClass=*)" will be used.
</emphasis></para>
</listitem>
</varlistentry>
[3/5] incubator-guacamole-manual git commit: GUACAMOLE-101: Remove
connection search filter documentation.
Posted by mj...@apache.org.
GUACAMOLE-101: Remove connection search filter documentation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/e23f09e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/e23f09e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/e23f09e7
Branch: refs/heads/master
Commit: e23f09e7e46f2f710a916c537e9b230e5cdae23c
Parents: 1b6fdca
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Mar 28 08:00:35 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Mar 28 12:44:31 2017 -0400
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/e23f09e7/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index 5d37c83..e9191cb 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -404,15 +404,6 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
</emphasis></para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><property>ldap-connection-search-filter</property></term>
- <listitem>
- <para>The search filter used to query the LDAP tree for connections that
- can be accessed from Guacamole. <emphasis>If this property is omitted
- the default of (objectClass=guacConfigGroup) will be used.
- </emphasis></para>
- </listitem>
- </varlistentry>
</variablelist>
<para>Again, even if the defaults are sufficient for the other properties, <emphasis>you
must still specify the <property>ldap-user-base-dn</property>