Skip to content

correct postfix version, and new main/master templates for RHEL7 #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jweissmit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

correct postfix version, and new main/master templates for RHEL7 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
case $::osfamily {
'RedHat': {
$postfix_version = $::operatingsystemmajrelease ? {
#'7' => '2.10.1',
'7' => '2.10.1',
'6' => '2.6.6',
'5' => '2.3.3',
default => '2.6.6',
Expand Down
2 changes: 2 additions & 0 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@
# FIXME : el6 template works for el7, but a new one would be prettier
if ( $::operatingsystem =~ /RedHat|CentOS/ and versioncmp($::operatingsystemrelease, '6') < 0 ) {
$filesuffix = '-el5'
} elsif ( $::operatingsystem =~ /RedHat|CentOS/ and versioncmp($::operatingsystemrelease, '6') > 0 ) {
$filesuffix = '-el7'
} else {
$filesuffix = ''
}
Expand Down
Loading