diff options
| author | elijah <elijah@riseup.net> | 2014-06-25 14:37:52 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-25 14:37:52 -0700 |
| commit | c463cb45bafeb308aa778844f3a0a7eadb467597 (patch) | |
| tree | 3fba3ed849ae386d45789c2651ca154e9037e0a9 /puppet | |
| parent | ffe760c06b3189bc5d67653e952fd44fdb0f08cf (diff) | |
| parent | fba004bc8cbee0d9556538342ce78ac1c9d1229b (diff) | |
Merge branch 'develop' into feature/couch
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 6 |
2 files changed, 8 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 => [ diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index 6461c5e8..8faf76f4 100644 --- a/puppet/modules/site_webapp/templates/config.yml.erb +++ b/puppet/modules/site_webapp/templates/config.yml.erb @@ -18,3 +18,9 @@ production: minimum_client_version: "<%= @webapp['client_version']['min'] %>" default_service_level: "<%= @webapp['default_service_level'] %>" service_levels: <%= @webapp['service_levels'].to_json %> +<%- if @webapp['engines'] && @webapp['engines'].any? -%> + engines: +<%- @webapp['engines'].each do |engine| -%> + - <%= engine %> +<%- end -%> +<%- end -%>
\ No newline at end of file |