From 579a9d4d2f68d020c993d1c680eb9022d8c789e3 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 28 Aug 2013 13:00:27 +0200 Subject: require VCS repo before git assume-unchanged (feature #1608) --- puppet/modules/site_webapp/manifests/init.pp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'puppet/modules') diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 1db52477..84ec8fab 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -54,12 +54,12 @@ class site_webapp { } exec { 'compile_assets': - cwd => '/srv/leap/webapp', - command => '/usr/bin/bundle exec rake assets:precompile', - user => 'leap-webapp', + cwd => '/srv/leap/webapp', + command => '/usr/bin/bundle exec rake assets:precompile', + user => 'leap-webapp', logoutput => on_failure, - require => Exec['bundler_update'], - notify => Service['apache']; + require => Exec['bundler_update'], + notify => Service['apache']; } file { @@ -74,14 +74,14 @@ class site_webapp { target => '/usr/local/share/ca-certificates/leap_api.crt'; "/srv/leap/webapp/public/${api_version}": - ensure => directory, + ensure => directory, require => Vcsrepo['/srv/leap/webapp'], - owner => leap-webapp, group => leap-webapp, mode => '0755'; + owner => leap-webapp, group => leap-webapp, mode => '0755'; "/srv/leap/webapp/public/${api_version}/config/": - ensure => directory, + ensure => directory, require => Vcsrepo['/srv/leap/webapp'], - owner => leap-webapp, group => leap-webapp, mode => '0755'; + owner => leap-webapp, group => leap-webapp, mode => '0755'; "/srv/leap/webapp/public/${api_version}/config/eip-service.json": content => $eip_service, @@ -141,14 +141,17 @@ class site_webapp { git::changes { 'app/assets/stylesheets/head.scss': cwd => '/srv/leap/webapp', + require => Vcsrepo['/srv/leap/webapp'], user => 'leap-webapp'; 'app/assets/stylesheets/tail.scss': cwd => '/srv/leap/webapp', + require => Vcsrepo['/srv/leap/webapp'], user => 'leap-webapp'; 'public/favicon.ico': cwd => '/srv/leap/webapp', + require => Vcsrepo['/srv/leap/webapp'], user => 'leap-webapp'; } -- cgit v1.2.3