Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sticking to one env-var management system #2247

Merged
merged 7 commits into from
Nov 18, 2019
Merged

Sticking to one env-var management system #2247

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
857308e
Sticking to one env-var management system
Leopere Nov 14, 2019
19110c7
Moving Postfix envvars pt 1
Leopere Nov 14, 2019
a44559f
Moving Postfix envvars pt 2 .env file
Leopere Nov 14, 2019
a409eae
Added missing envvars.
Leopere Nov 14, 2019
b64d3c3
Adding functioning glue
Leopere Nov 14, 2019
4ef8783
removed IP from example
Leopere Nov 16, 2019
08d05bc
Removed default network from update.
Leopere Nov 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions support/docker/production/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=172.18.0.3
PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
PEERTUBE_WEBSERVER_PORT=443
PEERTUBE_WEBSERVER_HTTPS=true
Expand All @@ -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
Expand Down
13 changes: 7 additions & 6 deletions support/docker/production/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,16 @@ 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"
labels:
traefik.enable: "false"
networks:
default:
ipv4_address: 172.20.0.3
Leopere marked this conversation as resolved.
Show resolved Hide resolved

redis:
image: redis:4-alpine
Expand All @@ -67,8 +68,8 @@ services:

postfix:
image: mwader/postfix-relay
environment:
- POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME}
env_file:
- .env
labels:
traefik.enable: "false"
restart: "always"
Expand Down