Add a container option (PGADMIN_DISABLE_POSTFIX) to disable the Postfix server.

This commit is contained in:
Dave Page 2021-01-20 11:50:05 +00:00
parent ddf7f04c94
commit 850afd7402
3 changed files with 18 additions and 1 deletions

View File

@ -41,6 +41,20 @@ to login to pgAdmin. This variable is required and must be set at launch time.
This is the password used when setting up the initial administrator account to This is the password used when setting up the initial administrator account to
login to pgAdmin. This variable is required and must be set at launch time. login to pgAdmin. This variable is required and must be set at launch time.
**PGADMIN_DISABLE_POSTFIX**
*Default: <null>*
If left unset, a Postfix server will be started to deliver password reset
emails.
If set to any value, the Postfix server will not be started, and pgAdmin will
need to be configured to use an external mail server using the *PGADMIN_CONFIG_*
options below.
This option is useful if you're running in an environment that prevents the use
of sudo to start Postfix, or if you wish to use an external mail server.
**PGADMIN_ENABLE_TLS** **PGADMIN_ENABLE_TLS**
*Default: <null>* *Default: <null>*

View File

@ -11,6 +11,7 @@ New features
| `Issue #1802 <https://redmine.postgresql.org/issues/1802>`_ - Added ERD Diagram support with basic table fields, primary key, foreign key, and DDL SQL generation. | `Issue #1802 <https://redmine.postgresql.org/issues/1802>`_ - Added ERD Diagram support with basic table fields, primary key, foreign key, and DDL SQL generation.
| `Issue #5457 <https://redmine.postgresql.org/issues/5457>`_ - Added support for Kerberos authentication, using SPNEGO to forward the Kerberos tickets through a browser. | `Issue #5457 <https://redmine.postgresql.org/issues/5457>`_ - Added support for Kerberos authentication, using SPNEGO to forward the Kerberos tickets through a browser.
| `Issue #6160 <https://redmine.postgresql.org/issues/6160>`_ - Add a container option (PGADMIN_DISABLE_POSTFIX) to disable the Postfix server.
Housekeeping Housekeeping
************ ************

View File

@ -48,7 +48,9 @@ if [ ! -f /var/lib/pgadmin/pgadmin4.db ]; then
fi fi
# Start Postfix to handle password resets etc. # Start Postfix to handle password resets etc.
sudo /usr/sbin/postfix start if [ -z ${PGADMIN_DISABLE_POSTFIX} ]; then
sudo /usr/sbin/postfix start
fi
# Get the session timeout from the pgAdmin config. We'll use this (in seconds) # Get the session timeout from the pgAdmin config. We'll use this (in seconds)
# to define the Gunicorn worker timeout # to define the Gunicorn worker timeout