summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-08-27 18:19:39 +0200
committervarac <varacanero@zeromail.org>2013-08-27 18:19:39 +0200
commitb478e6b72c463427e158ab6ff1caf737949e778f (patch)
treec6a89e1a9c684b97e17ba17315a4bd7a5dd1f9aa /puppet/modules
parent7810400fcd09ec4805632981c2034706ab07720f (diff)
parent40390f8c1e9c13ae1326bab88d9465a7f2f83701 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules')
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'),