update..

roles/common/tasks/caching-nameserver.yml

@@ -10,7 +10,7 @@
     update_cache: true
     cache_valid_time: "{{ 0 if apt_config_updated is defined and apt_config_updated.changed else apt_update_cache_valid_time }}"
   when:
-    - ansible_distribution == "Debian"
+    - ansible_facts["distribution"] == "Debian"
     - apt_update|bool
   tags:
     - apt-caching-nameserver
@@ -21,7 +21,7 @@
   changed_when: (_dpkg_configure.stdout | default('')) | length > 0
   failed_when: _dpkg_configure.rc != 0
   when:
-    - ansible_distribution == "Debian"
+    - ansible_facts["distribution"] == "Debian"
     - apt_update|bool
   tags:
     - apt-caching-nameserver
@@ -33,7 +33,7 @@
     update_cache: true
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
   when:
-    - ansible_distribution == "Debian"
+    - ansible_facts["distribution"] == "Debian"
     - apt_dpkg_configure|bool
   tags:
     - apt-caching-nameserver
@@ -44,7 +44,7 @@
     name: "{{ apt_bind_pkgs }}"
     state: present
   when:
-    - ansible_distribution == "Debian"
+    - ansible_facts["distribution"] == "Debian"
     - install_bind_packages|bool == true
   tags:
     - apt-caching-nameserver
@@ -61,7 +61,7 @@
     #cache_valid_time: 3600
   when:
     - ansible_os_family == "RedHat"
-    - ansible_distribution == "CentOS"
+    - ansible_facts["distribution"] == "CentOS"
   tags:
     - yum-update
 
@@ -71,7 +71,7 @@
     state: "{{ yum_install_state }}"
   when:
     - ansible_os_family == "RedHat"
-    - ansible_distribution == "CentOS"
+    - ansible_facts["distribution"] == "CentOS"
   tags:
     - yum-caching-nameserver
 
@@ -87,7 +87,7 @@
     group: bind
     mode: '0755'
   when:
-    - ansible_distribution == "Debian"
+    - ansible_facts["distribution"] == "Debian"
 
 
 - name: (caching-nameserver.yml) update named.conf.options configuration file (normal server)
@@ -104,7 +104,7 @@
     - apt-caching-nameserver
     - caching-nameserver
   when: 
-    - ansible_distribution == "Debian"
+    - ansible_facts["distribution"] == "Debian"
     - inventory_hostname not in groups["gateway_server"]
 
 # --------------------
@@ -130,7 +130,7 @@
     - apt-caching-nameserver
     - caching-nameserver
   when: 
-    - ansible_distribution == "Debian"
+    - ansible_facts["distribution"] == "Debian"
     - inventory_hostname in groups["gateway_server"]
 #    - not file_named_conf_options.stat.exists
 
@@ -150,6 +150,6 @@
   tags:
     - apt-caching-nameserver
   when: 
-    - ansible_distribution == "Debian"
+    - ansible_facts["distribution"] == "Debian"
     - not systemd_resolved
 

roles/common/templates/usr/local/src/mailsystem/conf/install_update_dovecot.conf.j2

@@ -194,6 +194,11 @@ auth_mechanisms="plain login"
 
 # - Settings for quota warning sript
 # - 
+{% if dovecot_msg_language is defined and dovecot_msg_language %}
+msg_language="{{ dovecot_msg_language }}"
+{% else %}
+msg_language=
+{% endif %}
 {% if dovecot_from_address is defined and dovecot_from_address %}
 from_address="{{ dovecot_from_address }}"
 {% else %}