summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-29 17:13:34 -0700
committerelijah <elijah@riseup.net>2013-07-29 17:13:34 -0700
commit3368fe07aac81e1bef8701c106234a6d67ccad6d (patch)
tree0e114cbb2bdcf245ac0b6772627997b2c0ccda8d /puppet/modules/site_webapp
parent9ac4380bc1c6c4c88392c371cd3f4b306c3879d9 (diff)
site_webapp bugfix - get compile_assets to run by ensuring .scss files are created beforehand and have the correct permissions.
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp12
1 files changed, 9 insertions, 3 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 1071ea1d..4815bab4 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -55,8 +55,9 @@ class site_webapp {
exec { 'compile_assets':
cwd => '/srv/leap/webapp',
- command => '/bin/bash -c "/usr/bin/bundle exec rake assets:precompile"',
+ command => '/usr/bin/bundle exec rake assets:precompile',
user => 'leap-webapp',
+ logoutput => on_failure,
require => Exec['bundler_update'],
notify => Service['apache'];
}
@@ -103,6 +104,7 @@ class site_webapp {
ensure => present,
owner => leap-webapp,
group => leap-webapp,
+ mode => '0644',
require => Vcsrepo['/srv/leap/webapp'],
source => $webapp['favicon'];
@@ -110,15 +112,19 @@ class site_webapp {
ensure => present,
owner => leap-webapp,
group => leap-webapp,
+ mode => '0644',
require => Vcsrepo['/srv/leap/webapp'],
- source => $webapp['tail_scss'];
+ source => $webapp['tail_scss'],
+ before => Exec['bundler_update'];
'/srv/leap/webapp/app/assets/stylesheets/head.scss':
ensure => present,
owner => leap-webapp,
group => leap-webapp,
+ mode => '0644',
require => Vcsrepo['/srv/leap/webapp'],
- source => $webapp['head_scss'];
+ source => $webapp['head_scss'],
+ before => Exec['bundler_update'];
'/srv/leap/webapp/public/img':
ensure => directory,