summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-19 11:52:26 +0200
committervarac <varacanero@zeromail.org>2013-09-19 11:52:26 +0200
commite182d12c72743491805a3873e8b6cd804fe5394c (patch)
tree01e7d2775e14421f3ef3ba37e8e000de9e0466b6 /puppet/modules/site_webapp
parente2ea69580ff9417efb7a85e8190d331051323ff3 (diff)
parent3388336b57cc59617b6dc8380beeeacfdb2fb5b3 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index b4d5bb14..97a75010 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -11,6 +11,8 @@ class site_webapp {
$api_version = $webapp['api_version']
$secret_token = $webapp['secret_token']
+ Class['site_config::default'] -> Class['site_webapp']
+
include site_config::ruby
include site_webapp::apache
include site_webapp::couchdb