diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml index f1f0616..e1117f8 100644 --- a/roles/mail/tasks/main.yml +++ b/roles/mail/tasks/main.yml @@ -51,49 +51,49 @@ notify: restart dovecot - name: Copy dovecot config files - template: src=dovecot.conf.j2 dest=/etc/dovecot/ owner=root mode=655 + template: src=dovecot.conf dest=/etc/dovecot/ owner=root mode=655 - name: Copy dovecot config files - template: src=dovecot-mysql.conf.j2 dest=/etc/dovecot/ owner=root mode=655 + template: src=dovecot-mysql.conf dest=/etc/dovecot/ owner=root mode=655 - name: Copy postfixadmin config files - template: src=config.inc.php.j2 dest=/etc/postfixadmin/ owner=root mode=655 + template: src=config.inc.php dest=/etc/postfixadmin/ owner=root mode=655 - name: Copy postfixadmin config files - template: src=dbconfig.inc.php.j2 dest=/etc/postfixadmin/ owner=root mode=655 + template: src=dbconfig.inc.php dest=/etc/postfixadmin/ owner=root mode=655 - name: Copy postfix config files - template: src=dynamicmaps.cf.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=dynamicmaps.cf dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=main.cf.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=main.cf dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=master.cf.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=master.cf dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=mysql_relay_domains.cf.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=mysql_relay_domains.cf dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=mysql_virtual_alias_maps.cf.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=mysql_virtual_alias_maps.cf dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=mysql_virtual_mailbox_domains.cf.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=mysql_virtual_mailbox_domains.cf dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=mysql_virtual_mailbox_maps.cf.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=mysql_virtual_mailbox_maps.cf dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=postfix-files.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=postfix-files dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=postfix-script.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=postfix-script dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=post-install.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=post-install dest=/etc/postfix/ owner=root mode=655 - name: Copy postfix config files - template: src=root-postfix.sql.j2 dest=/etc/postfix/ owner=root mode=655 + template: src=root-postfix.sql dest=/etc/postfix/ owner=root mode=655 - name: Create database for postfix shell: mysql < /etc/postfix/postfix.sql diff --git a/roles/mail/templates/config.inc.php.j2 b/roles/mail/templates/config.inc.php similarity index 100% rename from roles/mail/templates/config.inc.php.j2 rename to roles/mail/templates/config.inc.php diff --git a/roles/mail/templates/dbconfig.inc.php.j2 b/roles/mail/templates/dbconfig.inc.php similarity index 100% rename from roles/mail/templates/dbconfig.inc.php.j2 rename to roles/mail/templates/dbconfig.inc.php diff --git a/roles/mail/templates/dovecot-mysql.conf.j2 b/roles/mail/templates/dovecot-mysql.conf similarity index 100% rename from roles/mail/templates/dovecot-mysql.conf.j2 rename to roles/mail/templates/dovecot-mysql.conf diff --git a/roles/mail/templates/dovecot.conf.j2 b/roles/mail/templates/dovecot.conf similarity index 100% rename from roles/mail/templates/dovecot.conf.j2 rename to roles/mail/templates/dovecot.conf diff --git a/roles/mail/templates/dynamicmaps.cf.j2 b/roles/mail/templates/dynamicmaps.cf similarity index 100% rename from roles/mail/templates/dynamicmaps.cf.j2 rename to roles/mail/templates/dynamicmaps.cf diff --git a/roles/mail/templates/etc-default-postgrey.j2 b/roles/mail/templates/etc-default-postgrey similarity index 100% rename from roles/mail/templates/etc-default-postgrey.j2 rename to roles/mail/templates/etc-default-postgrey diff --git a/roles/mail/templates/main.cf.j2 b/roles/mail/templates/main.cf similarity index 100% rename from roles/mail/templates/main.cf.j2 rename to roles/mail/templates/main.cf diff --git a/roles/mail/templates/master.cf.j2 b/roles/mail/templates/master.cf similarity index 100% rename from roles/mail/templates/master.cf.j2 rename to roles/mail/templates/master.cf diff --git a/roles/mail/templates/mysql_relay_domains.cf.j2 b/roles/mail/templates/mysql_relay_domains.cf similarity index 100% rename from roles/mail/templates/mysql_relay_domains.cf.j2 rename to roles/mail/templates/mysql_relay_domains.cf diff --git a/roles/mail/templates/mysql_virtual_alias_maps.cf.j2 b/roles/mail/templates/mysql_virtual_alias_maps.cf similarity index 100% rename from roles/mail/templates/mysql_virtual_alias_maps.cf.j2 rename to roles/mail/templates/mysql_virtual_alias_maps.cf diff --git a/roles/mail/templates/mysql_virtual_mailbox_domains.cf.j2 b/roles/mail/templates/mysql_virtual_mailbox_domains.cf similarity index 100% rename from roles/mail/templates/mysql_virtual_mailbox_domains.cf.j2 rename to roles/mail/templates/mysql_virtual_mailbox_domains.cf diff --git a/roles/mail/templates/mysql_virtual_mailbox_maps.cf.j2 b/roles/mail/templates/mysql_virtual_mailbox_maps.cf similarity index 100% rename from roles/mail/templates/mysql_virtual_mailbox_maps.cf.j2 rename to roles/mail/templates/mysql_virtual_mailbox_maps.cf diff --git a/roles/mail/templates/post-install.j2 b/roles/mail/templates/post-install similarity index 100% rename from roles/mail/templates/post-install.j2 rename to roles/mail/templates/post-install diff --git a/roles/mail/templates/postfix-files.j2 b/roles/mail/templates/postfix-files similarity index 100% rename from roles/mail/templates/postfix-files.j2 rename to roles/mail/templates/postfix-files diff --git a/roles/mail/templates/postfix-script.j2 b/roles/mail/templates/postfix-script similarity index 100% rename from roles/mail/templates/postfix-script.j2 rename to roles/mail/templates/postfix-script diff --git a/roles/mail/templates/root-.my.cnf.j2 b/roles/mail/templates/root-.my.cnf similarity index 100% rename from roles/mail/templates/root-.my.cnf.j2 rename to roles/mail/templates/root-.my.cnf diff --git a/roles/mail/templates/root-postfix.sql.j2 b/roles/mail/templates/root-postfix.sql similarity index 100% rename from roles/mail/templates/root-postfix.sql.j2 rename to roles/mail/templates/root-postfix.sql