Fix for mysql import for virtualdomains

roles/mailserver/tasks/postfix.yml

@@ -15,8 +15,13 @@
 - name: Create database for mail server
   mysql_db: name={{ mail_mysql_database }} state=present
 
-  # i don't know why this import is failing but it is, so did this manually
-  # mysql_db: name={{ mail_mysql_database }} state=import target=templates/mailserver.sql.j2
+- name: copy over mailserver sql
+  template: src=mailserver.sql.j2 dest=/etc/postfix/import.sql owner=root group=root mode=0600
+  tags: import_mysql_postfix
+
+- name: import mysql postfix
+  mysql_db: name={{ mail_mysql_database }} state=import target=/etc/postfix/import.sql
+  tags: import_mysql_postfix
 
 - name: Copy Postfix config files into place
   template: src=etc_postfix_main.cf.j2 dest=/etc/postfix/main.cf owner=root group=root

roles/mailserver/templates/mailserver.sql.j2

@@ -1,10 +1,16 @@
-CREATE TABLE `virtual_domains` (
+-- If tables are not dropped, have to truncate before insert or use "insert or replace" (not postgres compatible)
+
+DROP TABLE IF EXISTS `virtual_users`;
+DROP TABLE IF EXISTS `virtual_aliases`;
+DROP TABLE IF EXISTS `virtual_domains`;
+
+CREATE TABLE IF NOT EXISTS `virtual_domains` (
 	`id` int(11) NOT NULL auto_increment,
 	`name` varchar(50) NOT NULL,
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `virtual_users` (
+CREATE TABLE IF NOT EXISTS `virtual_users` (
 	`id` int(11) NOT NULL auto_increment,
 	`domain_id` int(11) NOT NULL,
 	`password` varchar(106) NOT NULL,
@@ -14,7 +20,7 @@ CREATE TABLE `virtual_users` (
 	FOREIGN KEY (domain_id) REFERENCES virtual_domains(id) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `virtual_aliases` (
+CREATE TABLE IF NOT EXISTS `virtual_aliases` (
 	`id` int(11) NOT NULL auto_increment,
 	`domain_id` int(11) NOT NULL,
 	`source` varchar(100) NOT NULL,
@@ -24,13 +30,10 @@ CREATE TABLE `virtual_aliases` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 {% for virtual_domain in mail_virtual_domains %}
-	INSERT INTO `mailserver`.`virtual_domains` (`id`, `name`)
-	VALUES
-		('{{ virtual_domain.pk_id }}', '{{ virtual_domain.name }}');
+INSERT INTO `mailserver`.`virtual_domains` (`id`, `name`) VALUES ('{{ virtual_domain.pk_id }}', '{{ virtual_domain.name }}');
 {% endfor %}
 
 {% for virtual_user in mail_virtual_users %}
-	INSERT INTO `mailserver`.`virtual_users`  (`domain_id`, `password` , `email`)
-	VALUES
-  	('{{ virtual_domain.domain_pk_id }}', '{{ virtual_user.password_hash }}', '{{ virtual_user.address }}');
+INSERT INTO `mailserver`.`virtual_users`  (`domain_id`, `password` , `email`)
+	VALUES ('{{ virtual_user.domain_pk_id }}', '{{ virtual_user.password_hash }}', '{{ virtual_user.address }}');
 {% endfor %}