Skip to content
Snippets Groups Projects
Commit 454e4d29 authored by void's avatar void
Browse files

mailman mit mysql und nginx

parent 4995c3ba
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
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
- { path: "{{ basedir }}/secrets/mailman_db_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 }
- { path: "{{ basedir }}/secrets/mysql_root_pass", length: 28 }
# - name: pakete installieren # - name: pakete installieren
...@@ -54,6 +55,7 @@ ...@@ -54,6 +55,7 @@
with_items: with_items:
- docker-compose.yml - docker-compose.yml
- mailu.env - mailu.env
- mailman-nginx.conf
# - mailcow-dockerized/mailcow.conf # - mailcow-dockerized/mailcow.conf
# - mailcow-dockerized/docker-compose.override.yml # - mailcow-dockerized/docker-compose.override.yml
# - mailcow-dockerized/data/conf/postfix/extra.cf # - mailcow-dockerized/data/conf/postfix/extra.cf
......
...@@ -190,7 +190,7 @@ services: ...@@ -190,7 +190,7 @@ services:
volumes: volumes:
- "{{ basedir }}/mailman-core:/opt/mailman:rw,z" - "{{ basedir }}/mailman-core:/opt/mailman:rw,z"
environment: environment:
- DATABASE_URL=postgres://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb - DATABASE_URL=mysql://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb?charset=utf8mb4
- MTA=postfix - MTA=postfix
- MM_HOSTNAME=mailman-core - MM_HOSTNAME=mailman-core
- SMTP_HOST=postfix - SMTP_HOST=postfix
...@@ -210,7 +210,7 @@ services: ...@@ -210,7 +210,7 @@ services:
volumes: volumes:
- "{{ basedir }}/mailman-web:/opt/mailman-web-data:rw,z" - "{{ basedir }}/mailman-web:/opt/mailman-web-data:rw,z"
environment: environment:
- DATABASE_URL=postgres://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb - DATABASE_URL=mysql://mailman:{{ mailman_db_pass }}@mailman-db/mailmandb?charset=utf8mb4
- HYPERKITTY_API_KEY={{ hyperkitty_api_key }} - HYPERKITTY_API_KEY={{ hyperkitty_api_key }}
- SECRET_KEY={{ mailman_secret_key }} - SECRET_KEY={{ mailman_secret_key }}
- SERVE_FROM_DOMAIN={{ listserver }} - SERVE_FROM_DOMAIN={{ listserver }}
...@@ -233,23 +233,36 @@ services: ...@@ -233,23 +233,36 @@ services:
networks: networks:
- default - default
# mailman-nginx: mailman-db:
# container_name: mailman-nginx image: mariadb:10.5
# image: nginx:1.19 command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
# restart: always volumes:
# depends_on: - "{{ basedir }}/mailman-db:/var/lib/mysql"
# - mailman-web environment:
# volumes: - MYSQL_DATABASE=mailmandb
# - "{{ basedir }}/mailman-web/:/opt/mailman-web-data:ro,z" - MYSQL_USER=mailman
# - "{{ basedir }}/mailman-nginx.conf:/etc/nginx/conf.d/default.conf:ro" - MYSQL_PASSWORD={{ mailman_db_pass }}
# labels: - MYSQL_ROOT_PASSWORD={{ mysql_root_pass }}
# - traefik.enable=true networks:
# - traefik.http.routers.{{ servicename }}-mailman.rule=Host(`{{ listserver }}`) - default
# - traefik.http.routers.{{ servicename }}-mailman.entrypoints=websecure
# - traefik.http.services.{{ servicename }}-mailman.loadbalancer.server.port=80 mailman-nginx:
# networks: container_name: mailman-nginx
# - mailman image: nginx:1.19
# - web 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:
......
server {
listen 80;
listen [::]:80;
server_name listserver.warpzone.ms;
root /dev/null;
index index.html;
location / {
# First attempt to serve request as file, then
uwsgi_pass mailman-web:8080;
include uwsgi_params;
uwsgi_read_timeout 300;
}
location /static {
root /opt/mailman-web-data;
}
}
\ No newline at end of file
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