guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [1/4] incubator-guacamole-manual git commit: GUACAMOLE-189: Document guacd override columns of guacamole_connection table.
Date Wed, 07 Jun 2017 04:05:33 GMT
Repository: incubator-guacamole-manual
Updated Branches:
  refs/heads/staging/0.9.13-incubating b69d98e8c -> a1a4ee64d


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/staging/0.9.13-incubating
Commit: 1e48c45940a353e41b61a90804e9b22e74131d48
Parents: b69d98e
Author: Michael Jumper <mjumper@apache.org>
Authored: Sun Jun 4 16:00:37 2017 -0700
Committer: Michael Jumper <mjumper@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,


Mime
View raw message