summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2013-08-27 14:17:32 +0200
committerAzul <azul@riseup.net>2013-08-27 14:17:32 +0200
commit40390f8c1e9c13ae1326bab88d9465a7f2f83701 (patch)
treec9b5ef52f1c048136b1e19ac41fe9a9fe97fc468
parent2341a46e5fed90c8987ff1460e6d4fddfc939a07 (diff)
parentb1a8cfe5f82f2d96514fbfacff930fdd58dec5b8 (diff)
Merge branch 'feature/clean-webapp-deploy' into develop
m---------puppet/modules/git0
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp14
2 files changed, 14 insertions, 0 deletions
diff --git a/puppet/modules/git b/puppet/modules/git
-Subproject 497a1034489e0dc3cab5dab2fb0a85778576973
+Subproject ba5dd8d5c8e09d521ff49f1ebc753601e449f82
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 4815bab4..1db52477 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -138,6 +138,20 @@ class site_webapp {
source => $webapp['img_dir'];
}
+ git::changes {
+ 'app/assets/stylesheets/head.scss':
+ cwd => '/srv/leap/webapp',
+ user => 'leap-webapp';
+
+ 'app/assets/stylesheets/tail.scss':
+ cwd => '/srv/leap/webapp',
+ user => 'leap-webapp';
+
+ 'public/favicon.ico':
+ cwd => '/srv/leap/webapp',
+ user => 'leap-webapp';
+ }
+
file {
'/srv/leap/webapp/config/config.yml':
content => template('site_webapp/config.yml.erb'),