From 89b703386071579ff1cc485abd2d419c8c8927e4 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Thu, 28 Nov 2019 18:42:36 +0000 Subject: [PATCH] moved /etc/postfix/master.cf from common to shell --- roles/common/tasks/main.yml | 1 - roles/common/tasks/postfix.yml | 8 -------- roles/{common => shell}/files/etc/postfix/master.cf | 0 roles/shell/tasks/postfix.yml | 10 ++++++++++ 4 files changed, 10 insertions(+), 9 deletions(-) rename roles/{common => shell}/files/etc/postfix/master.cf (100%) diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index d91d4386..61e244ac 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -10,4 +10,3 @@ - include: manpage.yml - include: monitoring.yml - include: scripts.yml -- include: postfix.yml diff --git a/roles/common/tasks/postfix.yml b/roles/common/tasks/postfix.yml index e189dd42..b985771d 100644 --- a/roles/common/tasks/postfix.yml +++ b/roles/common/tasks/postfix.yml @@ -8,11 +8,3 @@ group: root mode: 0644 -# Deploy master.cf -- name: Deploy postfix conf - copy: - src: ../files/etc/postfix/master.cf - dest: /etc/postfix/master.cf - owner: root - group: root - mode: 0644 diff --git a/roles/common/files/etc/postfix/master.cf b/roles/shell/files/etc/postfix/master.cf similarity index 100% rename from roles/common/files/etc/postfix/master.cf rename to roles/shell/files/etc/postfix/master.cf diff --git a/roles/shell/tasks/postfix.yml b/roles/shell/tasks/postfix.yml index aa3f8b6a..37e113f5 100644 --- a/roles/shell/tasks/postfix.yml +++ b/roles/shell/tasks/postfix.yml @@ -8,3 +8,13 @@ group: root mode: 0644 notify: restart Postfix + +# Deploy master.cf +- name: Deploy postfix conf + copy: + src: ../files/etc/postfix/master.cf + dest: /etc/postfix/master.cf + owner: root + group: root + mode: 0644 + notify: restart Postfix