Fix sending mails from mailman-web. Fix static files.

This commit is contained in:
Víðir Valberg Guðmundsson 2021-03-05 16:28:37 +01:00
parent cdfa00d453
commit 24d91d36af
4 changed files with 17 additions and 1 deletions

View file

@ -1,5 +1,11 @@
--- ---
- name: copy nginx configuration to link static files
template:
src: "templates/mailman/nginx_vhost"
dest: "{{ nginx.volume_folder }}/vhost/lists.data.coop"
mode: "0644"
- name: run mailman server containers - name: run mailman server containers
docker_compose: docker_compose:
project_name: "mailman" project_name: "mailman"
@ -27,6 +33,7 @@
MTA: "postfix" MTA: "postfix"
SMTP_HOST: "{{ smtp_host }}" SMTP_HOST: "{{ smtp_host }}"
SMTP_PORT: "{{ smtp_port }}" SMTP_PORT: "{{ smtp_port }}"
SMTP_HOST_USER: "noop"
MM_HOSTNAME: "172.19.199.2" MM_HOSTNAME: "172.19.199.2"
networks: networks:
mailman: mailman:
@ -52,6 +59,8 @@
MAILMAN_ADMIN_EMAIL: "valberg@orn.li" MAILMAN_ADMIN_EMAIL: "valberg@orn.li"
MAILMAN_REST_URL: "http://172.19.199.2:8001" MAILMAN_REST_URL: "http://172.19.199.2:8001"
SECRET_KEY: "{{ mailman_secrets.django_secret_key }}" SECRET_KEY: "{{ mailman_secrets.django_secret_key }}"
SMTP_HOST: "{{ smtp_host }}"
SMTP_PORT: "{{ smtp_port }}"
VIRTUAL_HOST: "lists.data.coop" VIRTUAL_HOST: "lists.data.coop"
VIRTUAL_PORT: 8000 VIRTUAL_PORT: 8000
LETSENCRYPT_HOST: "lists.data.coop" LETSENCRYPT_HOST: "lists.data.coop"

View file

@ -29,6 +29,7 @@
- "{{ nginx.volume_folder }}/html:/usr/share/nginx/html" - "{{ nginx.volume_folder }}/html:/usr/share/nginx/html"
- "{{ nginx.volume_folder }}/dhparam:/etc/nginx/dhparam" - "{{ nginx.volume_folder }}/dhparam:/etc/nginx/dhparam"
- "{{ nginx.volume_folder }}/certs:/etc/nginx/certs:ro" - "{{ nginx.volume_folder }}/certs:/etc/nginx/certs:ro"
- "{{ volume_root_folder }}:/docker-volumes/:ro"
- /var/run/docker.sock:/tmp/docker.sock:ro - /var/run/docker.sock:/tmp/docker.sock:ro
- name: nginx letsencrypt container - name: nginx letsencrypt container

View file

@ -16,6 +16,9 @@
- 192.168.0.0/16 - 192.168.0.0/16
- 172.19.199.2 - 172.19.199.2
- 172.19.199.3 - 172.19.199.3
allowed_sender_domains:
- "{{ base_domain }}"
- "lists.data.coop"
docker_container: docker_container:
name: postfix name: postfix
image: boky/postfix image: boky/postfix
@ -23,5 +26,5 @@
networks: networks:
- name: postfix - name: postfix
env: env:
ALLOWED_SENDER_DOMAINS: "{{ base_domain }}" ALLOWED_SENDER_DOMAINS: "{{ allowed_sender_domains|join(' ') }}"
MYNETWORKS: "{{ mynetworks|join(',') }}" MYNETWORKS: "{{ mynetworks|join(',') }}"

View file

@ -0,0 +1,3 @@
location /static/ {
alias {{ volume_root_folder }}/mailman/web/static/;
}