From 969076a813b88dafd222c413bf6fbabab837eafb Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 1 Dec 2015 16:27:41 +0100
Subject: join case statements in init.pp

---
 manifests/init.pp | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index f92e20b..d298183 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -58,7 +58,7 @@ class postfix(
 
   case $::operatingsystem {
 
-    RedHat, CentOS: {
+    'RedHat', 'CentOS': {
       $master_cf_template = 'postfix/master.cf.redhat5.erb'
 
       # selinux labels differ from one distribution to another
@@ -67,6 +67,12 @@ class postfix(
         '5':     { $postfix_seltype = 'postfix_etc_t' }
         default: { $postfix_seltype = undef }
       }
+
+      postfix::config {
+        'sendmail_path': value => '/usr/sbin/sendmail.postfix';
+        'newaliases_path': value => '/usr/bin/newaliases.postfix';
+        'mailq_path': value => '/usr/bin/mailq.postfix';
+      }
     }
 
     'Debian': {
@@ -183,17 +189,6 @@ class postfix(
     'inet_interfaces': value => $inet_interfaces;
   }
 
-  case $::operatingsystem {
-    RedHat, CentOS: {
-      postfix::config {
-        'sendmail_path': value => '/usr/sbin/sendmail.postfix';
-        'newaliases_path': value => '/usr/bin/newaliases.postfix';
-        'mailq_path': value => '/usr/bin/mailq.postfix';
-      }
-    }
-    default: {}
-  }
-
   postfix::mailalias {'root':
     recipient => $root_mail_recipient,
   }
-- 
cgit v1.2.3