summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-07-26 14:21:22 -0400
committerMicah Anderson <micah@leap.se>2013-07-26 14:21:22 -0400
commit701c66c8de081f8148ab63c09f52fe97b122f54a (patch)
tree6cd2aef6d2041d200e071d184e46996945c07f35 /puppet/manifests/site.pp
parent4766d719b1181b636dc57374b478d2c21e369dc1 (diff)
parent8d28379aca4d8a79caa00afbf79ad4e5a204493f (diff)
Merge branch 'feature/mx' into develop
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp10
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 08cbbb9e..c7d00c61 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -11,7 +11,6 @@ Package { require => Exec['apt_updated'] }
include stdlib
-import 'common'
include site_config::default
include site_config::slow
@@ -30,6 +29,10 @@ if $services =~ /\bwebapp\b/ {
include site_nickserver
}
+if $services =~ /\bsoledad\b/ {
+ include soledad::server
+}
+
if $services =~ /\bmonitor\b/ {
include site_nagios
}
@@ -37,3 +40,8 @@ if $services =~ /\bmonitor\b/ {
if $services =~ /\btor\b/ {
include site_tor
}
+
+if $services =~ /\bmx\b/ {
+ include site_mx
+}
+