From 095a4bc14c2c42bc958d0c4ff2c1adb7eb2cdfb6 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Mon, 11 Jul 2016 20:30:58 +0200
Subject: [PATCH] postfix: Make transport map a template

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 roles/postfix/tasks/main.yml                  | 26 ++++++++-----------
 .../transport => templates/transport.j2}      |  0
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename roles/postfix/{files/transport => templates/transport.j2} (100%)

diff --git a/roles/postfix/tasks/main.yml b/roles/postfix/tasks/main.yml
index 816de6911..4e7890032 100644
--- a/roles/postfix/tasks/main.yml
+++ b/roles/postfix/tasks/main.yml
@@ -3,34 +3,30 @@
 - name: install postfix
   pacman: name=postfix state=present
 
-- name: install main.cf
-  template: src=main.cf.j2 dest=/etc/postfix/main.cf owner=root group=root mode=644
+- name: install template configs
+  template: src={{item}}.j2 dest=/etc/postfix/{{item}} owner=root group=root mode=644
   notify:
     - reload postfix
-
-- name: install master.cf
-  template: src=master.cf.j2 dest=/etc/postfix/master.cf owner=root group=root mode=644
-  notify:
-    - reload postfix
-
-- name: install aliases
-  template: src=aliases.j2 dest=/etc/postfix/aliases owner=root group=root mode=644
-
-- name: update aliases db
-  command: postalias /etc/postfix/aliases
+  with_items:
+    - main.cf
+    - master.cf
+    - transport
+    - aliases
 
 - name: install additional files
-  template: src=files/{{item}} dest=/etc/postfix/{{item}} owner=root group=root mode=644
+  copy: src={{item}} dest=/etc/postfix/{{item}} owner=root group=root mode=644
   with_items:
     - access_client
     - access_sender
     - access_helo
     - body_checks
     - header_checks
-    - transport
     - relocated
     - compat_maps
 
+- name: update aliases db
+  command: postalias /etc/postfix/aliases
+
 - name: postmap additional files
   command: postmap /etc/postfix/{{item}}
   with_items:
diff --git a/roles/postfix/files/transport b/roles/postfix/templates/transport.j2
similarity index 100%
rename from roles/postfix/files/transport
rename to roles/postfix/templates/transport.j2
-- 
GitLab