From 3368fe07aac81e1bef8701c106234a6d67ccad6d Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 29 Jul 2013 17:13:34 -0700 Subject: site_webapp bugfix - get compile_assets to run by ensuring .scss files are created beforehand and have the correct permissions. --- puppet/modules/site_webapp/manifests/init.pp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'puppet/modules/site_webapp/manifests') 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, -- cgit v1.2.3