diff options
author | elijah <elijah@riseup.net> | 2015-04-08 13:59:18 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2015-04-08 13:59:18 -0700 |
commit | 35df265409732086402dfa172356448d1a5d315b (patch) | |
tree | b93afc9a9003bef439a4a733ee426e4a056bf32e /puppet/modules/site_webapp | |
parent | 7bb8b2e0685b3738c7842e86c09b826c2732e8bd (diff) | |
parent | e3cfc2e1e7055ce2640fcce5bf810d6bd7930d2f (diff) |
Merge branch 'bugfix/rotatedb' into develop
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 5071d9bc..ea64048b 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -50,7 +50,7 @@ class site_webapp { owner => 'leap-webapp', group => 'leap-webapp', require => [ User['leap-webapp'], Group['leap-webapp'] ], - notify => [ Exec['bundler_update'], Exec['rotate_dbs'] ] + notify => Exec['bundler_update'] } exec { 'bundler_update': @@ -67,19 +67,6 @@ class site_webapp { notify => Service['apache']; } - # this only needs to be called before the first time the web app is run. - # after that, the cron job will take care of running db:rotate regularly. - exec { 'rotate_dbs': - cwd => '/srv/leap/webapp', - command => '/bin/bash -c "RAILS_ENV=production /usr/bin/bundle exec rake db:rotate"', - user => 'leap-webapp', - timeout => 600, - refreshonly => true, - require => [ - Vcsrepo['/srv/leap/webapp'], - Class['site_config::ruby::dev']]; - } - # # NOTE: in order to support a webapp that is running on a subpath and not the # root of the domain assets:precompile needs to be run with |