summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp/manifests
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-06-25 14:37:52 -0700
committerelijah <elijah@riseup.net>2014-06-25 14:37:52 -0700
commitc463cb45bafeb308aa778844f3a0a7eadb467597 (patch)
tree3fba3ed849ae386d45789c2651ca154e9037e0a9 /puppet/modules/site_webapp/manifests
parentffe760c06b3189bc5d67653e952fd44fdb0f08cf (diff)
parentfba004bc8cbee0d9556538342ce78ac1c9d1229b (diff)
Merge branch 'develop' into feature/couch
Diffstat (limited to 'puppet/modules/site_webapp/manifests')
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index d6f1d7ae..08618457 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -52,8 +52,8 @@ class site_webapp {
exec { 'bundler_update':
cwd => '/srv/leap/webapp',
- command => '/bin/bash -c "/usr/bin/bundle check || /usr/bin/bundle install --path vendor/bundle --without test development"',
- unless => '/usr/bin/bundle check',
+ command => '/bin/bash -c "/usr/bin/bundle check --path vendor/bundle || /usr/bin/bundle install --path vendor/bundle --without test development"',
+ unless => '/usr/bin/bundle check --path vendor/bundle',
user => 'leap-webapp',
timeout => 600,
require => [