summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2013-06-27 11:44:31 +0200
committerAzul <azul@riseup.net>2013-08-27 14:16:54 +0200
commitc4024b72d5aeebbd814a78c741658ca50eb4dc71 (patch)
tree6355f4123f206596fa3dd00f51260daca3855f31
parent2341a46e5fed90c8987ff1460e6d4fddfc939a07 (diff)
make git forget about the changes due to symlinking files
Git normally tracks the dummy files we replace with symlinks. So we tell it to ignore these changes on deploy.
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 4815bab4..ba7c7e0d 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -138,6 +138,12 @@ class site_webapp {
source => $webapp['img_dir'];
}
+ exec { 'git-assume-unchanged':
+ cwd => '/srv/leap/webapp',
+ command => '/bin/bash -c "/usr/bin/git update-index --assume-unchanged app/assets/stylesheets/head.scss app/assets/stylesheets/tail.scss public/favicon.ico"',
+ user => 'leap-webapp'
+ }
+
file {
'/srv/leap/webapp/config/config.yml':
content => template('site_webapp/config.yml.erb'),