summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2013-08-28 14:56:17 +0200
committerAzul <azul@riseup.net>2013-08-28 14:56:17 +0200
commit75171ab17ff26e93b8fa8a15a13c5c09be4e1cfc (patch)
tree13e822effc9a06847c8ec6a0af1745578f78b317 /puppet/modules/site_webapp
parent979e2f5d21a0516aec79063eff0a63ecbfabe661 (diff)
parent579a9d4d2f68d020c993d1c680eb9022d8c789e3 (diff)
Merge branch 'feature/clean-webapp-deploy' into develop
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp21
1 files changed, 12 insertions, 9 deletions
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';
}