mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Merge branch 'dev'
This commit is contained in:
		| @@ -288,7 +288,7 @@ with an optional `set_permissions` parameter which is of the form: | ||||
| } | ||||
| ``` | ||||
|  | ||||
| If this paramter is supplied the objects permissions will be overwritten, | ||||
| If this parameter is supplied the object's permissions will be overwritten, | ||||
| assuming the authenticated user has permission to do so (the user must be | ||||
| the object owner or a superuser). | ||||
|  | ||||
|   | ||||
| @@ -83,21 +83,29 @@ changed here. | ||||
|  | ||||
| `PAPERLESS_DBSSLMODE=<mode>` | ||||
|  | ||||
| : SSL mode to use when connecting to PostgreSQL. | ||||
| : SSL mode to use when connecting to PostgreSQL or MariaDB. | ||||
|  | ||||
|     See [the official documentation about | ||||
|     sslmode](https://www.postgresql.org/docs/current/libpq-ssl.html). | ||||
|     sslmode for PostgreSQL](https://www.postgresql.org/docs/current/libpq-ssl.html). | ||||
|  | ||||
|     Default is `prefer`. | ||||
|     See [the official documentation about | ||||
|     sslmode for MySQL and MariaDB](https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#option_general_ssl-mode). | ||||
|  | ||||
|     *Note*: SSL mode values differ between PostgreSQL and MariaDB. | ||||
|  | ||||
|     Default is `prefer` for PostgreSQL and `PREFERRED` for MariaDB. | ||||
|  | ||||
| `PAPERLESS_DBSSLROOTCERT=<ca-path>` | ||||
|  | ||||
| : SSL root certificate path | ||||
|  | ||||
|     See [the official documentation about | ||||
|     sslmode](https://www.postgresql.org/docs/current/libpq-ssl.html). | ||||
|     sslmode for PostgreSQL](https://www.postgresql.org/docs/current/libpq-ssl.html). | ||||
|     Changes path of `root.crt`. | ||||
|  | ||||
|     See [the official documentation about | ||||
|     sslmode for MySQL and MariaDB](https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#option_general_ssl-ca). | ||||
|  | ||||
|     Defaults to unset, using the documented path in the home directory. | ||||
|  | ||||
| `PAPERLESS_DBSSLCERT=<client-cert-path>` | ||||
| @@ -105,7 +113,11 @@ changed here. | ||||
| : SSL client certificate path | ||||
|  | ||||
|     See [the official documentation about | ||||
|     sslmode](https://www.postgresql.org/docs/current/libpq-ssl.html). | ||||
|     sslmode for PostgreSQL](https://www.postgresql.org/docs/current/libpq-ssl.html). | ||||
|  | ||||
|     See [the official documentation about | ||||
|     sslmode for MySQL and MariaDB](https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#option_general_ssl-cert). | ||||
|  | ||||
|     Changes path of `postgresql.crt`. | ||||
|  | ||||
|     Defaults to unset, using the documented path in the home directory. | ||||
| @@ -115,7 +127,11 @@ changed here. | ||||
| : SSL client key path | ||||
|  | ||||
|     See [the official documentation about | ||||
|     sslmode](https://www.postgresql.org/docs/current/libpq-ssl.html). | ||||
|     sslmode for PostgreSQL](https://www.postgresql.org/docs/current/libpq-ssl.html). | ||||
|  | ||||
|     See [the official documentation about | ||||
|     sslmode for MySQL and MariaDB](https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#option_general_ssl-key). | ||||
|  | ||||
|     Changes path of `postgresql.key`. | ||||
|  | ||||
|     Defaults to unset, using the documented path in the home directory. | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 shamoon
					shamoon