benjaoming
/
ansible
forked from data.coop/ansible
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mailu version variable.

This commit is contained in:
Víðir Valberg Guðmundsson 2019-03-05 13:19:41 +01:00
parent d0dd46e4f2
commit 6ffdac0c25
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/docker/defaults/main.yml
View File

@ -57,6 +57,7 @@ drone:
volume_folder: "{{ volume_root_folder }}/drone" volume_folder: "{{ volume_root_folder }}/drone"
mailu: mailu:
version: 1.6
domain: "mail.{{ base_domain }}" domain: "mail.{{ base_domain }}"
dns: 192.168.203.254 dns: 192.168.203.254
subnet: 192.168.203.0/24 subnet: 192.168.203.0/24

14
roles/docker/tasks/services/mailu.yml
View File

@ -36,7 +36,7 @@
- "{{ mailu.volume_folder }}/redis:/data" - "{{ mailu.volume_folder }}/redis:/data"
postgresql: postgresql:
image: mailu/postgresql:1.6 image: mailu/postgresql:{{ mailu.version }}
restart: always restart: always
env_file: "{{ mailu.volume_folder}}/mailu.env" env_file: "{{ mailu.volume_folder}}/mailu.env"
volumes: volumes:
@ -46,7 +46,7 @@
- name: mailu - name: mailu
front: front:
image: mailu/nginx:{{ mail_server_mailu_version }} image: mailu/nginx:{{ mailu.version }}
restart: always restart: always
env_file: "{{ mailu.volume_folder}}/mailu.env" env_file: "{{ mailu.volume_folder}}/mailu.env"
environment: environment:
@ -67,7 +67,7 @@
- external_services - external_services
resolver: resolver:
image: mailu/unbound:{{ mail_server_mailu_version }} image: mailu/unbound:{{ mailu.version }}
restart: always restart: always
env_file: "{{ mailu.volume_folder}}/mailu.env" env_file: "{{ mailu.volume_folder}}/mailu.env"
networks: networks:
@ -75,7 +75,7 @@
ipv4_address: "{{ mailu.dns }}" ipv4_address: "{{ mailu.dns }}"
admin: admin:
image: mailu/admin:{{ mail_server_mailu_version }} image: mailu/admin:{{ mailu.version }}
restart: always restart: always
env_file: "{{ mailu.volume_folder}}/mailu.env" env_file: "{{ mailu.volume_folder}}/mailu.env"
volumes: volumes:
@ -85,7 +85,7 @@
- redis - redis
imap: imap:
image: mailu/dovecot:{{ mail_server_mailu_version }} image: mailu/dovecot:{{ mailu.version }}
restart: always restart: always
env_file: "{{ mailu.volume_folder}}/mailu.env" env_file: "{{ mailu.volume_folder}}/mailu.env"
volumes: volumes:
@ -95,7 +95,7 @@
- front - front
smtp: smtp:
image: mailu/postfix:{{ mail_server_mailu_version }} image: mailu/postfix:{{ mailu.version }}
restart: always restart: always
env_file: "{{ mailu.volume_folder}}/mailu.env" env_file: "{{ mailu.volume_folder}}/mailu.env"
volumes: volumes:
@ -107,7 +107,7 @@
- "{{ mailu.dns }}" - "{{ mailu.dns }}"
antispam: antispam:
image: mailu/rspamd:{{ mail_server_mailu_version }} image: mailu/rspamd:{{ mailu.version }}
restart: always restart: always
env_file: "{{ mailu.volume_folder}}/mailu.env" env_file: "{{ mailu.volume_folder}}/mailu.env"
volumes: volumes: