Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Puppet Camptocamp Postfix
Commits
8395745b
Commit
8395745b
authored
Jul 23, 2013
by
Raphaël Pinson
Browse files
Move mta defaults to init, force mta params from satellite
parent
66b66f09
Changes
3
Hide whitespace changes
Inline
Side-by-side
manifests/init.pp
View file @
8395745b
...
...
@@ -69,25 +69,25 @@ class postfix (
$ldap_base
=
undef
,
$ldap_host
=
undef
,
$ldap_options
=
undef
,
$mail_user
=
'vmail'
,
# postfix_mail_user
$mail_user
=
'vmail'
,
# postfix_mail_user
$mailman
=
false
,
$maincf_source
=
"puppet:///modules/
${module_name}
/main.cf"
,
$mastercf_source
=
undef
,
$master_smtp
=
undef
,
# postfix_master_smtp
$master_smtps
=
undef
,
# postfix_master_smtps
$master_submission
=
undef
,
# postfix_master_submission
$master_smtp
=
undef
,
# postfix_master_smtp
$master_smtps
=
undef
,
# postfix_master_smtps
$master_submission
=
undef
,
# postfix_master_submission
$mta
=
false
,
$mydestination
=
undef
,
# postfix_mydestination
$mynetworks
=
undef
,
# postfix_mynetworks
$mydestination
=
'$myorigin'
,
# postfix_mydestination
$mynetworks
=
'127.0.0.0/8'
,
# postfix_mynetworks
$myorigin
=
$::fqdn
,
$relayhost
=
undef
,
# postfix_relayhost
$root_mail_recipient
=
'nobody'
,
# root_mail_recipient
$relayhost
=
undef
,
# postfix_relayhost
$root_mail_recipient
=
'nobody'
,
# root_mail_recipient
$satellite
=
false
,
$smtp_listen
=
'127.0.0.1'
,
# postfix_smtp_listen
$use_amavisd
=
false
,
# postfix_use_amavisd
$use_dovecot_lda
=
false
,
# postfix_use_dovecot_lda
$use_schleuder
=
false
,
# postfix_use_schleuder
$use_sympa
=
false
,
# postfix_use_sympa
$smtp_listen
=
'127.0.0.1'
,
# postfix_smtp_listen
$use_amavisd
=
false
,
# postfix_use_amavisd
$use_dovecot_lda
=
false
,
# postfix_use_dovecot_lda
$use_schleuder
=
false
,
# postfix_use_schleuder
$use_sympa
=
false
,
# postfix_use_sympa
)
inherits
postfix::params
{
...
...
manifests/mta.pp
View file @
8395745b
...
...
@@ -30,17 +30,10 @@
# }
# }
#
class
postfix::mta
{
$mydestination
=
$postfix::mydestination
?
{
undef
=>
'$myorigin'
,
default
=>
$postfix::mydestination
,
}
$mynetworks
=
$postfix::mynetworks
?
{
undef
=>
'127.0.0.0/8'
,
default
=>
$postfix::mynetworks
,
}
class
postfix::mta
(
$mydestination
=
$postfix::mydestination
,
$mynetworks
=
$postfix::mynetworks
,
)
{
validate_re
(
$postfix::relayhost
,
'^\S+$'
,
'You must pass $relayhost to the postfix class'
)
...
...
manifests/satellite.pp
View file @
8395745b
...
...
@@ -21,11 +21,17 @@
# include postfix::satellite
# }
#
class
postfix::satellite
{
class
postfix::satellite
(
$mydestination
=
$postfix::mydestination
,
$mynetworks
=
$postfix::mynetworks
,
)
{
validate_re
(
$postfix::myorigin
,
'^\S+$'
)
include
::postfix::mta
class
{
'::postfix::mta'
:
mydestination
=>
$mydestination
,
mynetworks
=>
$mynetworks
,
}
postfix::virtual
{
"@
${postfix::myorigin}
"
:
ensure
=>
present
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment