summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-10-11 17:54:55 +0200
committervarac <varacanero@zeromail.org>2013-10-11 17:54:55 +0200
commit55d866039cbfa9baa0a0d42210467050c400bbbe (patch)
tree729a70668c842a5aec77986bb02f4de1949692f2 /puppet/modules/site_config
parent9890125a57c3a06792e8d08ba15f1b636c764c61 (diff)
parent2a4ae58cc5e3f6e4a1e09ef6a9f15ade1e2c59fa (diff)
Merge branch 'feature/1683_configure_postfix_satellites' into develop
Diffstat (limited to 'puppet/modules/site_config')
-rw-r--r--puppet/modules/site_config/manifests/default.pp4
1 files changed, 4 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
+ }
+
}