From 6ffdac0c25a00e9d9efce89fd7a9d223f3ee6902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Tue, 5 Mar 2019 13:19:41 +0100
Subject: [PATCH] Fix mailu version variable.

---
 roles/docker/defaults/main.yml        |  1 +
 roles/docker/tasks/services/mailu.yml | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 3441898..adf3079 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -57,6 +57,7 @@ drone:
   volume_folder: "{{ volume_root_folder }}/drone"
 
 mailu:
+  version: 1.6
   domain: "mail.{{ base_domain }}"
   dns: 192.168.203.254
   subnet: 192.168.203.0/24
diff --git a/roles/docker/tasks/services/mailu.yml b/roles/docker/tasks/services/mailu.yml
index a593e8b..9a7b71a 100644
--- a/roles/docker/tasks/services/mailu.yml
+++ b/roles/docker/tasks/services/mailu.yml
@@ -36,7 +36,7 @@
             - "{{ mailu.volume_folder }}/redis:/data"
 
         postgresql:
-          image: mailu/postgresql:1.6
+          image: mailu/postgresql:{{ mailu.version }}
           restart: always
           env_file: "{{ mailu.volume_folder}}/mailu.env"
           volumes:
@@ -46,7 +46,7 @@
             - name: mailu
 
         front:
-          image: mailu/nginx:{{ mail_server_mailu_version }}
+          image: mailu/nginx:{{ mailu.version }}
           restart: always
           env_file: "{{ mailu.volume_folder}}/mailu.env"
           environment:
@@ -67,7 +67,7 @@
             - external_services
 
         resolver:
-          image: mailu/unbound:{{ mail_server_mailu_version }}
+          image: mailu/unbound:{{ mailu.version }}
           restart: always
           env_file: "{{ mailu.volume_folder}}/mailu.env"
           networks:
@@ -75,7 +75,7 @@
               ipv4_address: "{{ mailu.dns }}"
 
         admin:
-          image: mailu/admin:{{ mail_server_mailu_version }}
+          image: mailu/admin:{{ mailu.version }}
           restart: always
           env_file: "{{ mailu.volume_folder}}/mailu.env"
           volumes:
@@ -85,7 +85,7 @@
             - redis
 
         imap:
-          image: mailu/dovecot:{{ mail_server_mailu_version }}
+          image: mailu/dovecot:{{ mailu.version }}
           restart: always
           env_file: "{{ mailu.volume_folder}}/mailu.env"
           volumes:
@@ -95,7 +95,7 @@
             - front
 
         smtp:
-          image: mailu/postfix:{{ mail_server_mailu_version }}
+          image: mailu/postfix:{{ mailu.version }}
           restart: always
           env_file: "{{ mailu.volume_folder}}/mailu.env"
           volumes:
@@ -107,7 +107,7 @@
             - "{{ mailu.dns }}"
 
         antispam:
-          image: mailu/rspamd:{{ mail_server_mailu_version }}
+          image: mailu/rspamd:{{ mailu.version }}
           restart: always
           env_file: "{{ mailu.volume_folder}}/mailu.env"
           volumes: