Inject REST port, user, password from environment (#220)
Enable the port, user, and password used by Core for the REST API to be injected using environment variables.
This commit is contained in:
@@ -43,6 +43,15 @@ standard version of docker-compose.yaml from this repository.
|
|||||||
- `MM_HOSTNAME`: Which IP should Core bind to for REST API and LMTP. If not
|
- `MM_HOSTNAME`: Which IP should Core bind to for REST API and LMTP. If not
|
||||||
defined output for `hostname -i` command is used.
|
defined output for `hostname -i` command is used.
|
||||||
|
|
||||||
|
- `MAILMAN_REST_PORT`: Which port should Core use for the REST API. If not defined
|
||||||
|
the default is `8001`.
|
||||||
|
|
||||||
|
- `MAILMAN_REST_USER`: Which username should Core use for the REST API. If not
|
||||||
|
defined the default is `restadmin`.
|
||||||
|
|
||||||
|
- `MAILMAN_REST_PASSWORD`: Which password should Core use for the REST API. If
|
||||||
|
not defined the default is `restpass`.
|
||||||
|
|
||||||
- `SMTP_HOST`: IP Address/hostname from which you will be sending
|
- `SMTP_HOST`: IP Address/hostname from which you will be sending
|
||||||
emails. Default value is `172.19.199.1`, which is the address of the Host OS.
|
emails. Default value is `172.19.199.1`, which is the address of the Host OS.
|
||||||
|
|
||||||
@@ -89,6 +98,9 @@ sleep_time: 10s
|
|||||||
|
|
||||||
[webservice]
|
[webservice]
|
||||||
hostname: $MM_HOSTNAME
|
hostname: $MM_HOSTNAME
|
||||||
|
port: $MAILMAN_REST_PORT
|
||||||
|
admin_user: $MAILMAN_REST_USER
|
||||||
|
admin_pass: $MAILMAN_REST_PASSWORD
|
||||||
|
|
||||||
[archiver.hyperkitty]
|
[archiver.hyperkitty]
|
||||||
class: mailman_hyperkitty.Archiver
|
class: mailman_hyperkitty.Archiver
|
||||||
|
|||||||
@@ -41,6 +41,19 @@ if [[ ! -v SMTP_PORT ]]; then
|
|||||||
export SMTP_PORT=25
|
export SMTP_PORT=25
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check if REST port, username, and password are set, if not, set them
|
||||||
|
# to default values.
|
||||||
|
if [[ ! -v MAILMAN_REST_PORT ]]; then
|
||||||
|
export MAILMAN_REST_PORT='8001'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -v MAILMAN_REST_USER ]]; then
|
||||||
|
export MAILMAN_REST_USER='restadmin'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -v MAILMAN_REST_PASSWORD ]]; then
|
||||||
|
export MAILMAN_REST_PASSWORD='restpass'
|
||||||
|
fi
|
||||||
|
|
||||||
function setup_database () {
|
function setup_database () {
|
||||||
if [[ ! -v DATABASE_URL ]]
|
if [[ ! -v DATABASE_URL ]]
|
||||||
@@ -116,6 +129,9 @@ sleep_time: 10s
|
|||||||
|
|
||||||
[webservice]
|
[webservice]
|
||||||
hostname: $MM_HOSTNAME
|
hostname: $MM_HOSTNAME
|
||||||
|
port: $MAILMAN_REST_PORT
|
||||||
|
admin_user: $MAILMAN_REST_USER
|
||||||
|
admin_pass: $MAILMAN_REST_PASSWORD
|
||||||
|
|
||||||
[archiver.hyperkitty]
|
[archiver.hyperkitty]
|
||||||
class: mailman_hyperkitty.Archiver
|
class: mailman_hyperkitty.Archiver
|
||||||
|
|||||||
Reference in New Issue
Block a user