From 974e0aee685ff9145505c98aea87de3ba07d96f3 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 09:26:01 +0200
Subject: [PATCH] postfix: whether or not we touch main.cf is not dependent on
 membership in the lists role

---
 hieradata/nodes/bendel.debian.org.yaml | 2 ++
 modules/postfix/manifests/init.pp      | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 hieradata/nodes/bendel.debian.org.yaml

diff --git a/hieradata/nodes/bendel.debian.org.yaml b/hieradata/nodes/bendel.debian.org.yaml
new file mode 100644
index 000000000..68fcfea53
--- /dev/null
+++ b/hieradata/nodes/bendel.debian.org.yaml
@@ -0,0 +1,2 @@
+--- 
+postfix::manage_maincf: false
diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index cd6470a84..88591a94d 100644
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -1,4 +1,6 @@
-class postfix {
+class postfix(
+  Boolean $manage_maincf = true,
+) {
   package { 'postfix':
     ensure => installed
   }
@@ -19,7 +21,7 @@ class postfix {
   munin::check { 'ps_smtp': script => 'ps_' }
   munin::check { 'ps_smtpd': script => 'ps_' }
 
-  if ! has_role('lists') {
+  if $manage_maincf {
     concat { '/etc/postfix/main.cf':
       notify  => Exec['service postfix reload'],
     }
-- 
2.20.1