summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-10-10 18:49:36 +0200
committervarac <varacanero@zeromail.org>2013-10-11 17:54:30 +0200
commit04e270616db7d486eeacb298aed173731c9a2fe2 (patch)
treee04fee222fe956e69ffa87a81fc6e6fc8037973a
parent1d080ba042d9ce55c4eaad6d35f7fffefccdbbca (diff)
deploy postfix satellites on all nodes (Bug #1683)
-rw-r--r--puppet/modules/site_config/manifests/default.pp4
-rw-r--r--puppet/modules/site_postfix/manifests/satellite.pp11
2 files changed, 15 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index d3bb241f..a645cb1a 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -71,4 +71,8 @@ class site_config::default {
include site_squid_deb_proxy::client
}
+ if $::services !~ /\bmx\b/ {
+ include site_postfix::satellite
+ }
+
}
diff --git a/puppet/modules/site_postfix/manifests/satellite.pp b/puppet/modules/site_postfix/manifests/satellite.pp
new file mode 100644
index 00000000..de20b667
--- /dev/null
+++ b/puppet/modules/site_postfix/manifests/satellite.pp
@@ -0,0 +1,11 @@
+class site_postfix::satellite {
+
+ $root_mail_recipient = hiera ('contacts')
+ $mail = hiera ('mail')
+ $relayhost = $mail['smarthost']
+
+ class { '::postfix::satellite':
+ relayhost => $relayhost,
+ root_mail_recipient => $root_mail_recipient
+ }
+}