You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/06/07 03:31:50 UTC
[1/2] incubator-guacamole-manual git commit: GUACAMOLE-189: Document
guacd override columns of guacamole_connection table.
Repository: incubator-guacamole-manual
Updated Branches:
refs/heads/master 4b599f348 -> 1f2fbe331
GUACAMOLE-189: Document guacd override columns of guacamole_connection table.
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/1e48c459
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/1e48c459
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/1e48c459
Branch: refs/heads/master
Commit: 1e48c45940a353e41b61a90804e9b22e74131d48
Parents: b69d98e
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Jun 4 16:00:37 2017 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sun Jun 4 16:01:20 2017 -0700
----------------------------------------------------------------------
src/chapters/jdbc-auth.xml | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/1e48c459/src/chapters/jdbc-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index 710a2ff..930ceb1 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -978,6 +978,38 @@ INSERT INTO guacamole_user (username, password_salt, password_hash)
and a value of <constant>0</constant> denotes unlimited.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><property>proxy_hostname</property></term>
+ <listitem>
+ <para>The hostname or IP address of the Guacamole proxy daemon
+ (<package>guacd</package>) which should be used for this connection.
+ If <constant>NULL</constant>, the value defined with the
+ <property>guacd-hostname</property> property in
+ <filename>guacamole.properties</filename> will be used.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><property>proxy_port</property></term>
+ <listitem>
+ <para>The TCP port number of the Guacamole proxy daemon
+ (<package>guacd</package>) which should be used for this connection.
+ If <constant>NULL</constant>, the value defined with the
+ <property>guacd-port</property> property in
+ <filename>guacamole.properties</filename> will be used.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><property>proxy_encryption_method</property></term>
+ <listitem>
+ <para>The encryption method which should be used when communicating with the
+ Guacamole proxy daemon (<package>guacd</package>) for this connection.
+ This can be either <constant>NONE</constant>, for no encryption, or
+ <constant>SSL</constant>, for SSL/TLS. If <constant>NULL</constant>,
+ the encryption method will be dictated by the
+ <property>guacd-ssl</property> property in
+ <filename>guacamole.properties</filename>.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
<para>As there are potentially multiple parameters per connection, where the names of
each parameter are completely arbitrary and determined only by the protocol in use,
[2/2] incubator-guacamole-manual git commit: GUACAMOLE-189: Merge
documentation for guacd override guacamole_connection columns.
Posted by jm...@apache.org.
GUACAMOLE-189: Merge documentation for guacd override guacamole_connection columns.
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/1f2fbe33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/1f2fbe33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/1f2fbe33
Branch: refs/heads/master
Commit: 1f2fbe331e5bff95a00c7f27112d82490bf0814e
Parents: 4b599f3 1e48c45
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Jun 6 20:27:52 2017 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Jun 6 20:27:52 2017 -0700
----------------------------------------------------------------------
src/chapters/jdbc-auth.xml | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------