Skip to content
Snippets Groups Projects
Commit 4995c3ba authored by void's avatar void
Browse files

mailman container hinzugefügt

parent b60ba7f8
No related branches found
No related tags found
2 merge requests!119Revert "new var for dmarc rua reporting address",!55Mailsetup Migration from mailcow to mailu
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
servicename: mail, servicename: mail,
basedir: /srv/mail, basedir: /srv/mail,
domain: "enteentelos.com", domain: "enteentelos.com",
mailserver: "mailserver.enteentelos.com" mailserver: "mailserver.enteentelos.com",
listserver: "listserver.enteentelos.com"
} }
################################################## ##################################################
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
with_items: with_items:
- { path: "{{ basedir }}/secrets/mailu_secret_key", length: 32 } - { path: "{{ basedir }}/secrets/mailu_secret_key", length: 32 }
- { path: "{{ basedir }}/secrets/mailu_admin_pass", length: 32 } - { path: "{{ basedir }}/secrets/mailu_admin_pass", length: 32 }
# - { path: "{{ basedir }}/secrets/hyperkitty_api_key", length: 28 } - { path: "{{ basedir }}/secrets/hyperkitty_api_key", length: 28 }
# - { path: "{{ basedir }}/secrets/postgres_mailman_pass", length: 28 } - { path: "{{ basedir }}/secrets/mailman_db_pass", length: 28 }
# - { path: "{{ basedir }}/secrets/mailman_secret_key", length: 28 } - { path: "{{ basedir }}/secrets/mailman_secret_key", length: 28 }
# - { path: "{{ basedir }}/secrets/mailman_restapi_pass", length: 28 } - { path: "{{ basedir }}/secrets/mailman_restapi_pass", length: 28 }
# - name: pakete installieren # - name: pakete installieren
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
- "{{ basedir }}" - "{{ basedir }}"
- "{{ basedir }}/secrets" - "{{ basedir }}/secrets"
- "{{ basedir }}/mailu" - "{{ basedir }}/mailu"
# - "{{ basedir }}/mailman-core" - "{{ basedir }}/mailman-core"
# - "{{ basedir }}/mailman-core/var" - "{{ basedir }}/mailman-core/var"
# - "{{ basedir }}/mailman-core/var/data" - "{{ basedir }}/mailman-core/var/data"
# - "{{ basedir }}/mailman-web" - "{{ basedir }}/mailman-web"
# - "{{ basedir }}/mailman-postgres" - "{{ basedir }}/mailman-db"
# - name: "create folder struct for {{ servicename }} with rights" # - name: "create folder struct for {{ servicename }} with rights"
......
...@@ -4,7 +4,7 @@ services: ...@@ -4,7 +4,7 @@ services:
# External dependencies # External dependencies
redis: redis:
container_name: mailu_redis container_name: mailu-redis
image: redis:alpine image: redis:alpine
restart: always restart: always
volumes: volumes:
...@@ -67,7 +67,7 @@ services: ...@@ -67,7 +67,7 @@ services:
- 192.168.203.254 - 192.168.203.254
resolver: resolver:
container_name: mailu_unbound container_name: mailu-unbound
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-2.0} image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-2.0}
env_file: mailu.env env_file: mailu.env
restart: always restart: always
...@@ -76,7 +76,7 @@ services: ...@@ -76,7 +76,7 @@ services:
ipv4_address: 192.168.203.254 ipv4_address: 192.168.203.254
admin: admin:
container_name: mailu_admin container_name: mailu-admin
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-2.0} image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-2.0}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
...@@ -142,7 +142,7 @@ services: ...@@ -142,7 +142,7 @@ services:
- 192.168.203.254 - 192.168.203.254
antispam: antispam:
container_name: mailu_rspamd container_name: mailu-rspamd
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-2.0} image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-2.0}
hostname: antispam hostname: antispam
restart: always restart: always
...@@ -168,7 +168,7 @@ services: ...@@ -168,7 +168,7 @@ services:
# Optional services # Optional services
# Webmail # Webmail
webmail: webmail:
container_name: mailu_roundcube container_name: mailu-roundcube
image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}webmail:${MAILU_VERSION:-2.0} image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}webmail:${MAILU_VERSION:-2.0}
restart: always restart: always
env_file: mailu.env env_file: mailu.env
...@@ -180,6 +180,77 @@ services: ...@@ -180,6 +180,77 @@ services:
depends_on: depends_on:
- front - front
# Additional Services: mailman
mailman-core:
container_name: mailman-core
image: maxking/mailman-core:0.4
restart: always
depends_on:
- mailman-db
volumes:
- "{{ basedir }}/mailman-core:/opt/mailman:rw,z"
environment:
- DATABASE_URL=postgres://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb
- MTA=postfix
- MM_HOSTNAME=mailman-core
- SMTP_HOST=postfix
- SMTP_PORT=25
- MAILMAN_REST_USER=mailman
- MAILMAN_REST_PASSWORD={{ mailman_restapi_pass }}
- HYPERKITTY_URL=http://mailman-web:8000/hyperkitty
- HYPERKITTY_API_KEY={{ hyperkitty_api_key }}
networks:
- default
mailman-web:
image: maxking/mailman-web:0.4
restart: always
depends_on:
- mailman-db
volumes:
- "{{ basedir }}/mailman-web:/opt/mailman-web-data:rw,z"
environment:
- DATABASE_URL=postgres://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb
- HYPERKITTY_API_KEY={{ hyperkitty_api_key }}
- SECRET_KEY={{ mailman_secret_key }}
- SERVE_FROM_DOMAIN={{ listserver }}
- MAILMAN_REST_URL=http://mailman-core:8001
- MAILMAN_REST_USER=mailman
- MAILMAN_REST_PASSWORD={{ mailman_restapi_pass }}
networks:
- default
mailman-db:
container_name: mailman-db
image: postgres:11-alpine
restart: always
volumes:
- "{{ basedir }}/mailman-db:/var/lib/postgresql/data"
environment:
- POSTGRES_DB=mailmandb
- POSTGRES_USER=mailman
- POSTGRES_PASSWORD={{ mailman_db_pass }}
networks:
- default
# mailman-nginx:
# container_name: mailman-nginx
# image: nginx:1.19
# restart: always
# depends_on:
# - mailman-web
# volumes:
# - "{{ basedir }}/mailman-web/:/opt/mailman-web-data:ro,z"
# - "{{ basedir }}/mailman-nginx.conf:/etc/nginx/conf.d/default.conf:ro"
# labels:
# - traefik.enable=true
# - traefik.http.routers.{{ servicename }}-mailman.rule=Host(`{{ listserver }}`)
# - traefik.http.routers.{{ servicename }}-mailman.entrypoints=websecure
# - traefik.http.services.{{ servicename }}-mailman.loadbalancer.server.port=80
# networks:
# - mailman
# - web
networks: networks:
default: default:
driver: bridge driver: bridge
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment