Commit 6dfc690f authored by Wolf Noble's avatar Wolf Noble
Browse files

sort all parameters and options alphabetically. remove variable from mastercf...

sort all parameters and options alphabetically. remove variable from mastercf template declaration as it served no purpose
parent 6b1498a0
class postfix::files {
include postfix::params
$alias_maps = $postfix::all_alias_maps
$inet_interfaces = $postfix::inet_interfaces
$mail_user = $postfix::mail_user
$master_smtp = $postfix::master_smtp
$master_smtps = $postfix::master_smtps
$master_submission = $postfix::master_submission
$myorigin = $postfix::myorigin
$alias_maps = $postfix::all_alias_maps
$inet_interfaces = $postfix::inet_interfaces
$mail_user = $postfix::mail_user
$master_smtp = $postfix::master_smtp
$master_smtps = $postfix::master_smtps
$master_submission = $postfix::master_submission
$myorigin = $postfix::myorigin
$root_mail_recipient = $postfix::root_mail_recipient
$smtp_listen = $postfix::_smtp_listen
$use_amavisd = $postfix::use_amavisd
$use_dovecot_lda = $postfix::use_dovecot_lda
$use_schleuder = $postfix::use_schleuder
$use_sympa = $postfix::use_sympa
$smtp_listen = $postfix::_smtp_listen
$use_amavisd = $postfix::use_amavisd
$use_dovecot_lda = $postfix::use_dovecot_lda
$use_schleuder = $postfix::use_schleuder
$use_sympa = $postfix::use_sympa
file { '/etc/mailname':
ensure => present,
......@@ -25,9 +25,9 @@ class postfix::files {
file { '/etc/aliases':
ensure => present,
content => "# file managed by puppet\n",
notify => Exec['newaliases'],
replace => false,
seltype => $postfix::params::seltype,
notify => Exec['newaliases'],
}
# Aliases
......@@ -43,43 +43,43 @@ class postfix::files {
} else {
$mastercf_content = template(
$postfix::params::master_os_template,
"${module_name}/master.cf.common.erb"
'postfix/master.cf.common.erb'
)
}
file { '/etc/postfix/master.cf':
ensure => present,
owner => 'root',
content => $mastercf_content,
group => 'root',
mode => '0644',
source => $postfix::mastercf_source,
content => $mastercf_content,
owner => 'root',
seltype => $postfix::params::seltype,
source => $postfix::mastercf_source,
}
# Config files
file { '/etc/postfix/main.cf':
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
source => $postfix::maincf_source,
owner => 'root',
replace => false,
seltype => $postfix::params::seltype,
source => $postfix::maincf_source,
}
::postfix::config {
'myorigin': value => $myorigin;
'alias_maps': value => $alias_maps;
'inet_interfaces': value => $inet_interfaces;
'myorigin': value => $myorigin;
}
case $::osfamily {
'RedHat': {
::postfix::config {
'sendmail_path': value => '/usr/sbin/sendmail.postfix';
'newaliases_path': value => '/usr/bin/newaliases.postfix';
'mailq_path': value => '/usr/bin/mailq.postfix';
'newaliases_path': value => '/usr/bin/newaliases.postfix';
'sendmail_path': value => '/usr/sbin/sendmail.postfix';
}
}
default: {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment