diff options
| author | elijah <elijah@riseup.net> | 2014-06-22 12:26:45 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-22 12:26:45 -0700 |
| commit | 897815dc5a3a058b3210b76eb74a3dfae9b9165c (patch) | |
| tree | bdcc23f649e585d5e2e43cb721b58a2a730d4b85 | |
| parent | c62c9c2e63cfc82fc57f321609e407cfeabd9cdf (diff) | |
| parent | 2a3b4ec1bc522409d4dc8d2e7750344de41acb50 (diff) | |
Merge branch 'feature/webapp' into develop
| -rw-r--r-- | provider_base/services/webapp.json | 5 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index bbb52094..a5b1ed30 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -26,7 +26,10 @@ "nagios_test_user": { "username": "nagios_test", "password": "= secret :nagios_test_password" - } + }, + "engines": [ + "support" + ] }, "stunnel": { "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" 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 |