Merge pull request #35 from CERIT-SC/master
RH/CentOS release version comparison fix
diff --git a/manifests/params.pp b/manifests/params.pp
index dd97118..de95184 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -19,6 +19,7 @@
$dovecot_directory = '/usr/libexec/dovecot'
$postfix_package = 'postfix'
$postfix_mysql_package = 'postfix-mysql'
+ $postfix_package_ensure = installed
$postgrey_package = 'postgrey'
$spamassassin_package = 'spamassassin'
$spampd_package = 'spampd'
@@ -43,6 +44,7 @@
$dovecot_directory = '/usr/lib/dovecot'
$postfix_package = 'postfix'
$postfix_mysql_package = 'postfix-mysql'
+ $postfix_package_ensure = installed
$postgrey_package = 'postgrey'
$spamassassin_package = 'spamassassin'
$spampd_package = 'spampd'
@@ -67,6 +69,7 @@
$dovecot_directory = '/usr/local/libexec/dovecot'
$postfix_package = 'mail/postfix'
$postfix_mysql_package = 'mail/postfix'
+ $postfix_package_ensure = installed
$postgrey_package = 'mail/postgrey'
$spamassassin_package = 'mail/spamassassin'
$spampd_package = 'mail/spampd'
diff --git a/manifests/server.pp b/manifests/server.pp
index c3c3cbc..a1872bd 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -134,25 +134,26 @@
$postgrey_policy_service = undef,
$clamav = false,
# Parameters
- $command_directory = $::postfix::params::command_directory,
- $config_directory = $::postfix::params::config_directory,
- $daemon_directory = $::postfix::params::daemon_directory,
- $data_directory = $::postfix::params::data_directory,
- $manpage_directory = $::postfix::params::manpage_directory,
- $readme_directory = $::postfix::params::readme_directory,
- $sample_directory = $::postfix::params::sample_directory,
- $postfix_package = $::postfix::params::postfix_package,
- $postfix_mysql_package = $::postfix::params::postfix_mysql_package,
- $postgrey_package = $::postfix::params::postgrey_package,
- $service_restart = $::postfix::params::service_restart,
- $spamassassin_package = $::postfix::params::spamassassin_package,
- $spampd_package = $::postfix::params::spampd_package,
- $spampd_config = $::postfix::params::spampd_config,
- $spampd_template = $::postfix::params::spampd_template,
- $root_group = $::postfix::params::root_group,
- $mailq_path = $::postfix::params::mailq_path,
- $newaliases_path = $::postfix::params::newaliases_path,
- $sendmail_path = $::postfix::params::sendmail_path
+ $command_directory = $::postfix::params::command_directory,
+ $config_directory = $::postfix::params::config_directory,
+ $daemon_directory = $::postfix::params::daemon_directory,
+ $data_directory = $::postfix::params::data_directory,
+ $manpage_directory = $::postfix::params::manpage_directory,
+ $readme_directory = $::postfix::params::readme_directory,
+ $sample_directory = $::postfix::params::sample_directory,
+ $postfix_package = $::postfix::params::postfix_package,
+ $postfix_mysql_package = $::postfix::params::postfix_mysql_package,
+ $postfix_package_ensure = $::postfix::params::postfix_package_ensure,
+ $postgrey_package = $::postfix::params::postgrey_package,
+ $service_restart = $::postfix::params::service_restart,
+ $spamassassin_package = $::postfix::params::spamassassin_package,
+ $spampd_package = $::postfix::params::spampd_package,
+ $spampd_config = $::postfix::params::spampd_config,
+ $spampd_template = $::postfix::params::spampd_template,
+ $root_group = $::postfix::params::root_group,
+ $mailq_path = $::postfix::params::mailq_path,
+ $newaliases_path = $::postfix::params::newaliases_path,
+ $sendmail_path = $::postfix::params::sendmail_path
) inherits ::postfix::params {
# Default has el5 files, for el6 a few defaults have changed
@@ -168,7 +169,7 @@
} else {
$package_name = $postfix_package
}
- package { $package_name: ensure => installed, alias => 'postfix' }
+ package { $package_name: ensure => $postfix_package_ensure, alias => 'postfix' }
service { 'postfix':
require => Package[$package_name],
