Merge pull request #591 from mikeashley/opendmarc-fix

Make opendmarc database setup more robust

roles/mailserver/handlers/main.yml

@@ -19,6 +19,3 @@
 
 - name: restart rspamd
   service: name=rspamd state=restarted
-
-- name: import opendmarc schema
-  mysql_db: name={{ mail_db_opendmarc_database }} state=import target=/usr/share/doc/opendmarc/schema.mysql

roles/mailserver/tasks/main.yml

@@ -1,7 +1,7 @@
 - include: postfix.yml tags=postfix
 - include: dovecot.yml tags=dovecot
 - include: opendkim.yml tags=opendkim
-- include: opendmarc.yml tags=dmarc
+- include: opendmarc.yml tags=opendmarc
 - include: rspamd.yml tags=rspamd
 - include: solr.yml tags=solr
 - include: checkrbl.yml tags=checkrbl

roles/mailserver/tasks/opendmarc.yml

@@ -39,7 +39,11 @@
 
 - name: Create database for OpenDMARC reports
   mysql_db: name={{ mail_db_opendmarc_database }} state=present
-  notify: import opendmarc schema
+  register: db_created
+
+- name: Import opendmarc schema
+  mysql_db: name={{ mail_db_opendmarc_database }} state=import target=/usr/share/doc/opendmarc/schema.mysql
+  when: db_created.changed
 
 - name: Copy nightly OpenDMARC report generation script into place
   template: src=etc_opendmarc_report.sh.j2 dest=/etc/opendmarc/report.sh owner=root group=root mode="755"