From 34663c35c6849f65f39efc379c4a8e3285140f0d Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Wed, 6 Apr 2016 19:32:14 +0200
Subject: [PATCH] Fix amavis config file paths.

---
 roles/mail/tasks/main.yml                                     | 4 ++--
 .../templates/amavis/{ => conf.d}/15-content_filter_mode.j2   | 0
 roles/mail/templates/amavis/{ => conf.d}/50-user.j2           | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename roles/mail/templates/amavis/{ => conf.d}/15-content_filter_mode.j2 (100%)
 rename roles/mail/templates/amavis/{ => conf.d}/50-user.j2 (100%)

diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index e4d053e..f6593b2 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -29,8 +29,8 @@
 - name: Configure amavis
   template: src={{ item }}.j2 dest=/etc/{{ item }}
   with_items:
-  - amavis/15-content_filter_mode
-  - amavis/50-user
+  - amavis/conf.d/15-content_filter_mode
+  - amavis/conf.d/50-user
   notify: Restart amavis
 
 - name: Create dovecot ssl directory
diff --git a/roles/mail/templates/amavis/15-content_filter_mode.j2 b/roles/mail/templates/amavis/conf.d/15-content_filter_mode.j2
similarity index 100%
rename from roles/mail/templates/amavis/15-content_filter_mode.j2
rename to roles/mail/templates/amavis/conf.d/15-content_filter_mode.j2
diff --git a/roles/mail/templates/amavis/50-user.j2 b/roles/mail/templates/amavis/conf.d/50-user.j2
similarity index 100%
rename from roles/mail/templates/amavis/50-user.j2
rename to roles/mail/templates/amavis/conf.d/50-user.j2