From 03235f93f32edf225128d24325b486531138e486 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 18 Apr 2016 15:23:28 +0200
Subject: [feat] always set smtpd_relay_restrictions

now that we deprecate wheezy, we can always set
smtpd_relay_restrictions
---
 puppet/modules/site_postfix/manifests/mx.pp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 2dac85f5..e94320c9 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -140,21 +140,13 @@ class site_postfix::mx {
   # greater verbosity for debugging, take out for production
   #include site_postfix::debug
 
-  case $::operatingsystemrelease {
-    /^7.*/: {
-      $smtpd_relay_restrictions=''
-    }
-    default:  {
-      $smtpd_relay_restrictions="  -o smtpd_relay_restrictions=\$smtps_relay_restrictions\n"
-    }
-  }
-
   $mastercf_tail = "
 smtps     inet  n       -       -       -       -       smtpd
   -o smtpd_tls_wrappermode=yes
   -o smtpd_tls_security_level=encrypt
   -o tls_preempt_cipherlist=yes
-${smtpd_relay_restrictions}  -o smtpd_recipient_restrictions=\$smtps_recipient_restrictions
+  -o smtpd_relay_restrictions=\$smtps_relay_restrictions
+  -o smtpd_recipient_restrictions=\$smtps_recipient_restrictions
   -o smtpd_helo_restrictions=\$smtps_helo_restrictions
   -o smtpd_client_restrictions=
   -o cleanup_service_name=clean_smtps
-- 
cgit v1.2.3