aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-12-01 16:27:41 +0100
committervarac <varacanero@zeromail.org>2015-12-01 16:27:41 +0100
commit969076a813b88dafd222c413bf6fbabab837eafb (patch)
tree638ca4d1ce5148c897bb71870a1ffce715e4eefb
parentf4201357e5da4cbdecd558218c262c01d92c4697 (diff)
downloadpuppet-postfix-969076a813b88dafd222c413bf6fbabab837eafb.tar.gz
puppet-postfix-969076a813b88dafd222c413bf6fbabab837eafb.tar.bz2
join case statements in init.pp
-rw-r--r--manifests/init.pp19
1 files 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,
}