projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move the onion address lookup for people.d.o to the template
[mirror/dsa-puppet.git]
/
modules
/
postfix
/
manifests
/
init.pp
diff --git
a/modules/postfix/manifests/init.pp
b/modules/postfix/manifests/init.pp
index
cd6470a
..
4d5c31d
100644
(file)
--- a/
modules/postfix/manifests/init.pp
+++ b/
modules/postfix/manifests/init.pp
@@
-1,14
+1,27
@@
-class postfix {
+# postfix class
+# @param use_smarthost use the smarthost
+# @param smarthost host to relay through (if set and use_smarthost)
+class postfix(
+ Optional[String] $smarthost,
+ Boolean $use_smarthost = true,
+ Boolean $manage_maincf = true,
+) {
package { 'postfix':
ensure => installed
}
package { 'postfix':
ensure => installed
}
+ if $use_smarthost {
+ if ! smarthost {
+ fail('No smarthost set but use_smarthost is true')
+ }
+ } else {
+ $heavy = true
+ }
+
service { 'postfix':
ensure => running
}
service { 'postfix':
ensure => running
}
- include debian_org::mail_incoming_port
-
munin::check { 'ps_exim4': ensure => absent }
munin::check { 'exim_mailqueue': ensure => absent }
munin::check { 'exim_mailstats': ensure => absent }
munin::check { 'ps_exim4': ensure => absent }
munin::check { 'exim_mailqueue': ensure => absent }
munin::check { 'exim_mailstats': ensure => absent }
@@
-19,7
+32,7
@@
class postfix {
munin::check { 'ps_smtp': script => 'ps_' }
munin::check { 'ps_smtpd': script => 'ps_' }
munin::check { 'ps_smtp': script => 'ps_' }
munin::check { 'ps_smtpd': script => 'ps_' }
- if
! has_role('lists')
{
+ if
$manage_maincf
{
concat { '/etc/postfix/main.cf':
notify => Exec['service postfix reload'],
}
concat { '/etc/postfix/main.cf':
notify => Exec['service postfix reload'],
}