GUACAMOLE-728: Merge documentation for configuring SSL database connections.
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index 4f5ec43..2246ddb 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -974,6 +974,26 @@
</para>
</entry>
</row>
+ <row>
+ <entry><parameter>sftp-disable-download</parameter></entry>
+ <entry>
+ <para>If set to true downloads from the remote system to
+ the client (browser) will be disabled. The default is
+ false, which means that downloads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
+ <entry><parameter>sftp-disable-upload</parameter></entry>
+ <entry>
+ <para>If set to true uploads from the client (browser) to
+ the remote system will be disabled. The default is
+ false, which means that uploads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -2417,6 +2437,30 @@
</entry>
</row>
<row>
+ <entry><parameter>disable-download</parameter></entry>
+ <entry>
+ <para>If set to true downloads from the remote server to
+ client (browser) will be disabled. This includes both
+ downloads down via the hidden Guacamole menu, as well
+ as using the special "Download" folder presented to
+ the remote server. The default is false, which means
+ that downloads will be allowed.</para>
+ <para>If file transfer is not enabled, this parameter is
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
+ <entry><parameter>disable-upload</parameter></entry>
+ <entry>
+ <para>If set to true, uploads from the client (browser)
+ to the remote server location will be disabled. The
+ default is false, which means uploads will be allowed
+ if file transfer is enabled.</para>
+ <para>If file transfer is not enabled, this parameter is
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>drive-name</parameter></entry>
<entry>
<para>The name of the filesystem used when passed through to
@@ -2862,6 +2906,26 @@
</para>
</entry>
</row>
+ <row>
+ <entry><parameter>sftp-disable-download</parameter></entry>
+ <entry>
+ <para>If set to true downloads from the remote system to
+ the client (browser) will be disabled. The default is
+ false, which means that downloads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
+ <entry><parameter>sftp-disable-upload</parameter></entry>
+ <entry>
+ <para>If set to true uploads from the client (browser) to
+ the remote system will be disabled. The default is
+ false, which means that uploads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -4135,6 +4199,26 @@
the root directory will be used by default.</para>
</entry>
</row>
+ <row>
+ <entry><parameter>sftp-disable-download</parameter></entry>
+ <entry>
+ <para>If set to true downloads from the remote system to
+ the client (browser) will be disabled. The default is
+ false, which means that downloads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
+ <entry><parameter>sftp-disable-upload</parameter></entry>
+ <entry>
+ <para>If set to true uploads from the client (browser) to
+ the remote system will be disabled. The default is
+ false, which means that uploads will be enabled.</para>
+ <para>If sftp is not enabled, this parameter will be
+ ignored.</para>
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
diff --git a/src/chapters/installing.xml b/src/chapters/installing.xml
index 9518f48..ba94a32 100644
--- a/src/chapters/installing.xml
+++ b/src/chapters/installing.xml
@@ -288,8 +288,9 @@
<para>The <command>guacenc</command> utility, provided by
<package>guacamole-server</package> to translate screen recordings into video,
depends on FFmpeg, and will only be built if at least the
- <package>libavcodec</package>, <package>libavutil</package>, and
- <package>libswscale</package> libraries provided by FFmpeg are installed.</para>
+ <package>libavcodec</package>, <package>libavformat</package>,
+ <package>libavutil</package>, and <package>libswscale</package> libraries
+ provided by FFmpeg are installed.</para>
<important>
<para>If you lack these dependencies, <emphasis>then the features or protocols which
depend on them will not be enabled</emphasis>. Please read this section
@@ -310,12 +311,13 @@
<entry><link xl:href="https://ffmpeg.org/">FFmpeg</link></entry>
<entry>
<para>The <package>libavcodec</package>,
- <package>libavutil</package>, and
- <package>libswscale</package> libraries provided by FFmpeg
- are used by <command>guacenc</command> to encode video streams
- when translating recordings of Guacamole sessions. Without
- FFmpeg, the <command>guacenc</command> utility will simply not
- be built.</para>
+ <package>libavformat</package>,
+ <package>libavutil</package>, and <package>libswscale</package>
+ libraries provided by FFmpeg are used by
+ <command>guacenc</command> to encode video streams when
+ translating recordings of Guacamole sessions. Without FFmpeg,
+ the <command>guacenc</command> utility will simply not be
+ built.</para>
<para>If you do not wish to make graphical recordings of Guacamole
sessions, or do not wish to translate such recordings into
video, then FFmpeg is not needed.</para>
@@ -328,6 +330,7 @@
<entry>Debian / Ubuntu package</entry>
<entry>
<para><package>libavcodec-dev</package>,
+ <package>libavformat-dev</package>,
<package>libavutil-dev</package>,
<package>libswscale-dev</package></para>
</entry>
@@ -676,6 +679,7 @@
freerdp2 ............ yes
pango ............... yes
libavcodec .......... yes
+ libavformat ......... yes
libavutil ........... yes
libssh2 ............. yes
libssl .............. yes
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index e0a3976..28bfde5 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -966,6 +966,32 @@
Guacamole will report that the login is invalid, as if the user does not exist at
all.</para>
</section>
+ <section xml:id="jdbc-auth-auto-create">
+ <title>Auto-creating database users</title>
+ <para>Guacamole supports the ability to layer authentication modules on top of one another
+ such that users successfully authenticated from one extension (e.g. LDAP) can be assigned
+ permissions to connections in another extension (e.g. JDBC). Other extensions, like the
+ TOTP extension, rely on the database extension to be able to store information for
+ various user accounts. In these situations it can be difficult to have to manually
+ create user accounts within the database extension.</para>
+ <para>The database extension provides a mechanism for enabling auto-creation of user
+ accounts that successfully authenticate from other extensions. This functionality
+ is disabled by default, but can be enabled in each of the supported database
+ extensions by enabling the appropriate option in guacamole.properties. The
+ resulting accounts will only have READ access to themselves until additional
+ permissions are granted, either explicitly by the administrator or by
+ permissions assigned to groups of which the user is a member.</para>
+ <informalexample>
+ <programlisting># MySQL
+mysql-auto-create-accounts: true
+
+# PostgreSQL
+postgresql-auto-create-accounts: true
+
+# SQL Server
+sqlserver-auto-create-accounts: true</programlisting>
+ </informalexample>
+ </section>
<section>
<title>Completing the installation</title>
<para>Guacamole will only reread <filename>guacamole.properties</filename> and load
