diff options
| author | varac <varacanero@zeromail.org> | 2013-10-11 18:04:10 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-11 18:04:10 +0200 |
| commit | 3952d62b25aebe935f5d0b46e25de2f87c796b2f (patch) | |
| tree | 27d3608f13ad9e545e14b40acce74591cc7f6fec /puppet/modules/site_webapp | |
| parent | 55d866039cbfa9baa0a0d42210467050c400bbbe (diff) | |
| parent | da6cb0546f91444d8c4e059eaa99f17fafe9c5a2 (diff) | |
Merge branch 'feature/4079_dont_remove_build_packages' into develop
Diffstat (limited to 'puppet/modules/site_webapp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index c85a5ddc..6c5bda4c 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -13,7 +13,7 @@ class site_webapp { Class['site_config::default'] -> Class['site_webapp'] - include site_config::ruby + include site_config::ruby::dev include site_webapp::apache include site_webapp::couchdb include site_webapp::haproxy @@ -55,7 +55,11 @@ class site_webapp { unless => '/usr/bin/bundle check', user => 'leap-webapp', timeout => 600, - require => [ Class['bundler::install'], Vcsrepo['/srv/leap/webapp'], Service['shorewall'] ], + require => [ + Class['bundler::install'], + Vcsrepo['/srv/leap/webapp'], + Class['site_config::ruby::dev'], + Service['shorewall'] ], notify => Service['apache']; } |