summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-07-26 14:11:33 -0400
committerMicah Anderson <micah@leap.se>2013-07-26 14:11:33 -0400
commit8d28379aca4d8a79caa00afbf79ad4e5a204493f (patch)
tree5fa0bedba730c04762953e0d49deaba8554d08f2 /puppet/manifests
parentc8922ffdf2ec8f459c4ed225329ea5fb634f4799 (diff)
parent1c9c5a5fec51919a8e9ec14f5fe9b16c538bb4fa (diff)
Merge branch 'feature/soledad' into feature/leap_mx
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index c1ac8396..c7d00c61 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -29,6 +29,10 @@ if $services =~ /\bwebapp\b/ {
include site_nickserver
}
+if $services =~ /\bsoledad\b/ {
+ include soledad::server
+}
+
if $services =~ /\bmonitor\b/ {
include site_nagios
}