Sticking to one env-var management system (#2247)
* Sticking to one env-var management system Starting with the Postgres container so that you only have to set overlapping environment variables in one place. * Moving Postfix envvars pt 1 * Moving Postfix envvars pt 2 .env file * Added missing envvars. * Adding functioning glue Suggest something better if you wish. * removed IP from example * Removed default network from update.
This commit is contained in:
parent
6037544235
commit
e2882b2ccb
2 changed files with 11 additions and 8 deletions
|
@ -1,5 +1,9 @@
|
|||
PEERTUBE_DB_USERNAME=postgres_user
|
||||
PEERTUBE_DB_PASSWORD=postgres_password
|
||||
POSTGRES_USER=peertube
|
||||
POSTGRES_PASSWORD=peertube
|
||||
POSTGRES_DB=peertube
|
||||
PEERTUBE_DB_USERNAME=$(POSTGRES_USER)
|
||||
PEERTUBE_DB_PASSWORD=$(POSTGRES_PASSWORD)
|
||||
PEERTUBE_DB_HOSTNAME=postgres
|
||||
PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
|
||||
PEERTUBE_WEBSERVER_PORT=443
|
||||
PEERTUBE_WEBSERVER_HTTPS=true
|
||||
|
@ -14,6 +18,7 @@ PEERTUBE_SMTP_FROM=noreply@domain.tld
|
|||
PEERTUBE_SMTP_TLS=false
|
||||
PEERTUBE_SMTP_DISABLE_STARTTLS=false
|
||||
PEERTUBE_ADMIN_EMAIL=admin@domain.tld
|
||||
POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME}
|
||||
# /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\
|
||||
#PEERTUBE_SIGNUP_ENABLED=true
|
||||
#PEERTUBE_TRANSCODING_ENABLED=true
|
||||
|
|
|
@ -47,10 +47,8 @@ services:
|
|||
|
||||
postgres:
|
||||
image: postgres:10-alpine
|
||||
environment:
|
||||
POSTGRES_USER: ${PEERTUBE_DB_USERNAME}
|
||||
POSTGRES_PASSWORD: ${PEERTUBE_DB_PASSWORD}
|
||||
POSTGRES_DB: peertube
|
||||
env_file:
|
||||
- .env
|
||||
volumes:
|
||||
- ./docker-volume/db:/var/lib/postgresql/data
|
||||
restart: "always"
|
||||
|
@ -67,8 +65,8 @@ services:
|
|||
|
||||
postfix:
|
||||
image: mwader/postfix-relay
|
||||
environment:
|
||||
- POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME}
|
||||
env_file:
|
||||
- .env
|
||||
labels:
|
||||
traefik.enable: "false"
|
||||
restart: "always"
|
||||
|
|
Loading…
Reference in a new issue