Getting closer...

This commit is contained in:
Víðir Valberg Guðmundsson 2021-03-04 23:32:09 +01:00
parent d678b15085
commit 4f88f200b1

View file

@ -4,38 +4,14 @@
docker_compose: docker_compose:
project_name: "mailman" project_name: "mailman"
definition: definition:
version: '2' version: '3'
services: services:
mailman-web:
image: maxking/mailman-web:0.3.5
depends_on:
- database
links:
- database:database
volumes:
- /opt/mailman/web:/opt/mailman-web-data
environment:
DATABASE_TYPE: "postgres"
DATABASE_URL: "postgres://mailman:{{ mailman_secrets.postgres_password }}@database/mailmandb"
HYPERKITTY_API_KEY: "{{ mailman_secrets.hyperkitty_api_key }}"
SERVE_FROM_DOMAIN: "lists.data.coop"
MAILMAN_ADMIN_USER: "valberg"
MAILMAN_ADMIN_EMAIL: "valberg@orn.li"
SECRET_KEY: "{{ mailman_secrets.django_secret_key }}"
VIRTUAL_HOST: "lists.data.coop"
VIRTUAL_PORT: 8000
LETSENCRYPT_HOST: "lists.data.coop"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
networks:
- "mailman"
- "postfix"
- "external_services"
mailman-core: mailman-core:
image: maxking/mailman-core:0.3 image: maxking/mailman-core:0.3.11
volumes: volumes:
- /opt/mailman/core:/opt/mailman/ - "{{ volume_root_folder }}/mailman/core:/opt/mailman"
stop_grace_period: 30s stop_grace_period: 30s
links: links:
- mailman-web:mailmain-web - mailman-web:mailmain-web
@ -43,29 +19,69 @@
depends_on: depends_on:
- database - database
environment: environment:
DATABASE_URL: "postgres://mailman:{{ mailman_secrets.postgres_password }}@database/mailmandb" DATABASE_URL: "postgres://mailman:{{ mailman_secrets.postgres_password }}@172.19.199.4/mailmandb"
DATABASE_TYPE: "postgres" DATABASE_TYPE: "postgres"
DATABASE_CLASS: "mailman.database.postgresql.PostgreSQLDatabase" DATABASE_CLASS: "mailman.database.postgresql.PostgreSQLDatabase"
HYPERKITTY_API_KEY: "{{ mailman_secrets.hyperkitty_api_key }}" HYPERKITTY_API_KEY: "{{ mailman_secrets.hyperkitty_api_key }}"
HYPERKITTY_URL: http://172.19.199.3:8000/hyperkitty
MTA: "postfix"
SMTP_HOST: "{{ smtp_host }}"
SMTP_PORT: "{{ smtp_port }}"
MM_HOSTNAME: "172.19.199.2"
networks: networks:
- "mailman" mailman:
- "postfix" ipv4_address: 172.19.199.2
- "external_services" postfix:
external_services:
mailman-web:
image: maxking/mailman-web:0.3.11
depends_on:
- database
links:
- database:database
volumes:
- "{{ volume_root_folder }}/mailman/web:/opt/mailman-web-data"
environment:
DATABASE_TYPE: "postgres"
DATABASE_URL: "postgres://mailman:{{ mailman_secrets.postgres_password }}@172.19.199.4/mailmandb"
HYPERKITTY_API_KEY: "{{ mailman_secrets.hyperkitty_api_key }}"
DJANGO_ALLOWED_HOSTS: "lists.data.coop"
SERVE_FROM_DOMAIN: "lists.data.coop"
MAILMAN_ADMIN_USER: "valberg"
MAILMAN_ADMIN_EMAIL: "valberg@orn.li"
MAILMAN_REST_URL: "http://172.19.199.2:8001"
SECRET_KEY: "{{ mailman_secrets.django_secret_key }}"
VIRTUAL_HOST: "lists.data.coop"
VIRTUAL_PORT: 8080
LETSENCRYPT_HOST: "lists.data.coop"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
networks:
mailman:
ipv4_address: 172.19.199.3
postfix:
external_services:
database: database:
image: postgres:13
restart: always
environment: environment:
POSTGRES_DB: mailmandb POSTGRES_DB: mailmandb
POSTGRES_USER: mailman POSTGRES_USER: mailman
POSTGRES_PASSWORD: "{{ mailman_secrets.postgres_password }}" POSTGRES_PASSWORD: "{{ mailman_secrets.postgres_password }}"
restart: always
image: postgres:13
volumes: volumes:
- /opt/mailman/database:/var/lib/postgresql/data - "{{ volume_root_folder }}/mailman/database:/var/lib/postgresql/data"
networks: networks:
- "mailman" mailman:
ipv4_address: 172.19.199.4
networks: networks:
mailman: mailman:
driver: bridge
ipam:
driver: default
config:
- subnet: 172.19.199.0/24
postfix: postfix:
external: true external: true
external_services: external_services: