summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-11-27 16:04:51 -0500
committerMicah Anderson <micah@riseup.net>2012-11-27 16:04:51 -0500
commitb85ac1f7d58e267c66b089ccd4a087b6b21c91e1 (patch)
tree6052b349bf766401d9b2e0f51c6932832e95cf06 /puppet/manifests/site.pp
parent05d3c0903f48e9c0d69145c9e027b70a392c9602 (diff)
parentea60af41f4a5a7bdd67fd7da129716c8f698cf1a (diff)
Merge branch 'feature/webapp' into develop
Diffstat (limited to 'puppet/manifests/site.pp')
-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 0ae86f8e..9da2174c 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -18,4 +18,8 @@ node 'default' {
if 'couchdb' in $services {
include site_couchdb
}
+
+ if 'webapp' in $services {
+ include site_webapp
+ }
}