Move secrets to SOPS, add REST_USER
All checks were successful
/ Ansible Lint (push) Successful in 9m15s
All checks were successful
/ Ansible Lint (push) Successful in 9m15s
This commit is contained in:
parent
cc5dfb3cf7
commit
a76f01aea7
3 changed files with 17 additions and 12 deletions
|
|
@ -12,11 +12,13 @@ services:
|
|||
depends_on:
|
||||
- database
|
||||
environment:
|
||||
- DATABASE_URL=postgresql://mailman:wvQjbMRnwFuxGEPz@database/mailmandb
|
||||
- "DATABASE_URL=postgresql://mailman:{{ secret__lists__postgres_password }}@database/mailmandb"
|
||||
- DATABASE_TYPE=postgres
|
||||
- DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase
|
||||
- HYPERKITTY_API_KEY=ITfRjushI6FP0TLMnRpZxlfB2e17DN86
|
||||
- HYPERKITTY_API_KEY={{ secret__lists__hyperkitty_api_key }}
|
||||
- MTA=postfix
|
||||
- MAILMAN_REST_USER=restuser
|
||||
- MAILMAN_REST_PASSWORD={{ secret__lists__rest_password }}
|
||||
ports:
|
||||
- "127.0.0.1:8001:8001" # API
|
||||
- "127.0.0.1:8024:8024" # LMTP - incoming emails
|
||||
|
|
@ -39,11 +41,11 @@ services:
|
|||
- ./files/templates:/opt/mailman-web/templates
|
||||
environment:
|
||||
- DATABASE_TYPE=postgres
|
||||
- DATABASE_URL=postgresql://mailman:wvQjbMRnwFuxGEPz@database/mailmandb
|
||||
- "DATABASE_URL=postgresql://mailman:{{ secret__lists__postgres_password }}@database/mailmandb"
|
||||
- "DJANGO_ALLOWED_HOSTS=lists.hamburg.ccc.de,lists.c3lingo.org"
|
||||
- HYPERKITTY_API_KEY=ITfRjushI6FP0TLMnRpZxlfB2e17DN86
|
||||
- HYPERKITTY_API_KEY={{ secret__lists__hyperkitty_api_key }}
|
||||
- SERVE_FROM_DOMAIN=lists.hamburg.ccc.de
|
||||
- SECRET_KEY=ugfknEYBaFVc62R1jlIjnkizQaqr7tSt
|
||||
- SECRET_KEY={{ secret__lists__web_secret_key }}
|
||||
- MAILMAN_ADMIN_USER=ccchh-admin
|
||||
- MAILMAN_ADMIN_EMAIL=tony@cowtest.hamburg.ccc.de
|
||||
ports:
|
||||
|
|
@ -57,7 +59,7 @@ services:
|
|||
environment:
|
||||
- POSTGRES_DB=mailmandb
|
||||
- POSTGRES_USER=mailman
|
||||
- POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz
|
||||
- "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
|
||||
image: docker.io/library/postgres:12-alpine
|
||||
volumes:
|
||||
- /opt/mailman/database:/var/lib/postgresql/data
|
||||
|
|
@ -70,5 +72,4 @@ networks:
|
|||
ipam:
|
||||
driver: default
|
||||
config:
|
||||
-
|
||||
subnet: 172.19.199.0/24
|
||||
- subnet: 172.19.199.0/24
|
||||
Loading…
Add table
Add a link
Reference in a new issue