From d7724d549dac4d7287254bd489e873594e4a64cb Mon Sep 17 00:00:00 2001
From: theonlydoo <theonlydoo@github.com>
Date: Sun, 12 Oct 2014 15:17:36 +0200
Subject: [PATCH] =?UTF-8?q?bugavec=20les=20fichiers=20.j2,=20je=20supprime?=
 =?UTF-8?q?=20l'extension=20pour=20revenir=20=C3=A0=20la=20'normale'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/mail/tasks/main.yml                     | 30 +++++++++----------
 .../{config.inc.php.j2 => config.inc.php}     |  0
 .../{dbconfig.inc.php.j2 => dbconfig.inc.php} |  0
 ...vecot-mysql.conf.j2 => dovecot-mysql.conf} |  0
 .../{dovecot.conf.j2 => dovecot.conf}         |  0
 .../{dynamicmaps.cf.j2 => dynamicmaps.cf}     |  0
 ...fault-postgrey.j2 => etc-default-postgrey} |  0
 roles/mail/templates/{main.cf.j2 => main.cf}  |  0
 .../templates/{master.cf.j2 => master.cf}     |  0
 ...y_domains.cf.j2 => mysql_relay_domains.cf} |  0
 ...maps.cf.j2 => mysql_virtual_alias_maps.cf} |  0
 ...cf.j2 => mysql_virtual_mailbox_domains.cf} |  0
 ...ps.cf.j2 => mysql_virtual_mailbox_maps.cf} |  0
 .../{post-install.j2 => post-install}         |  0
 .../{postfix-files.j2 => postfix-files}       |  0
 .../{postfix-script.j2 => postfix-script}     |  0
 .../{root-.my.cnf.j2 => root-.my.cnf}         |  0
 .../{root-postfix.sql.j2 => root-postfix.sql} |  0
 18 files changed, 15 insertions(+), 15 deletions(-)
 rename roles/mail/templates/{config.inc.php.j2 => config.inc.php} (100%)
 rename roles/mail/templates/{dbconfig.inc.php.j2 => dbconfig.inc.php} (100%)
 rename roles/mail/templates/{dovecot-mysql.conf.j2 => dovecot-mysql.conf} (100%)
 rename roles/mail/templates/{dovecot.conf.j2 => dovecot.conf} (100%)
 rename roles/mail/templates/{dynamicmaps.cf.j2 => dynamicmaps.cf} (100%)
 rename roles/mail/templates/{etc-default-postgrey.j2 => etc-default-postgrey} (100%)
 rename roles/mail/templates/{main.cf.j2 => main.cf} (100%)
 rename roles/mail/templates/{master.cf.j2 => master.cf} (100%)
 rename roles/mail/templates/{mysql_relay_domains.cf.j2 => mysql_relay_domains.cf} (100%)
 rename roles/mail/templates/{mysql_virtual_alias_maps.cf.j2 => mysql_virtual_alias_maps.cf} (100%)
 rename roles/mail/templates/{mysql_virtual_mailbox_domains.cf.j2 => mysql_virtual_mailbox_domains.cf} (100%)
 rename roles/mail/templates/{mysql_virtual_mailbox_maps.cf.j2 => mysql_virtual_mailbox_maps.cf} (100%)
 rename roles/mail/templates/{post-install.j2 => post-install} (100%)
 rename roles/mail/templates/{postfix-files.j2 => postfix-files} (100%)
 rename roles/mail/templates/{postfix-script.j2 => postfix-script} (100%)
 rename roles/mail/templates/{root-.my.cnf.j2 => root-.my.cnf} (100%)
 rename roles/mail/templates/{root-postfix.sql.j2 => root-postfix.sql} (100%)

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