From c4024b72d5aeebbd814a78c741658ca50eb4dc71 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 27 Jun 2013 11:44:31 +0200
Subject: 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.
---
 puppet/modules/site_webapp/manifests/init.pp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'puppet/modules/site_webapp/manifests/init.pp')

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'),
-- 
cgit v1.2.3


From b35146bf42bae91f1211b51dba568295f8d5b8f0 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 26 Aug 2013 12:04:14 +0200
Subject: git:changes expect changes to certain files

You can either ensure assume-unchanged or ensure those changes are tracked.
Used to keep the git status clean.
---
 puppet/modules/site_webapp/manifests/init.pp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/site_webapp/manifests/init.pp')

diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index ba7c7e0d..a8807a1a 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -138,10 +138,15 @@ 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'
+  git:changes { 
+    '/srv/leap/webapp/app/assets/stylesheets/head.scss':
+      user    => 'leap-webapp';
+
+    '/srv/leap/webapp/app/assets/stylesheets/tail.scss':
+      user    => 'leap-webapp';
+
+    '/srv/leap/webapp/public/favicon.ico':
+      user    => 'leap-webapp';
   }
 
   file {
-- 
cgit v1.2.3


From 3aa062ecb934731aa5876e60bb7c9086bcbb5742 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Mon, 26 Aug 2013 12:21:08 +0200
Subject: specify cwd when using git:changes

---
 puppet/modules/site_webapp/manifests/init.pp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/site_webapp/manifests/init.pp')

diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index a8807a1a..4bae2088 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -138,14 +138,17 @@ class site_webapp {
       source  => $webapp['img_dir'];
   }
 
-  git:changes { 
-    '/srv/leap/webapp/app/assets/stylesheets/head.scss':
+  git::changes { 
+    'app/assets/stylesheets/head.scss':
+      cwd     => '/srv/leap/webapp',
       user    => 'leap-webapp';
 
-    '/srv/leap/webapp/app/assets/stylesheets/tail.scss':
+    'app/assets/stylesheets/tail.scss':
+      cwd     => '/srv/leap/webapp',
       user    => 'leap-webapp';
 
-    '/srv/leap/webapp/public/favicon.ico':
+    'public/favicon.ico':
+      cwd     => '/srv/leap/webapp',
       user    => 'leap-webapp';
   }
 
-- 
cgit v1.2.3


From b1a8cfe5f82f2d96514fbfacff930fdd58dec5b8 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 27 Aug 2013 14:16:00 +0200
Subject: move git::changes into git module, whitespace fix

---
 puppet/modules/site_webapp/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_webapp/manifests/init.pp')

diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 4bae2088..1db52477 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -138,7 +138,7 @@ class site_webapp {
       source  => $webapp['img_dir'];
   }
 
-  git::changes { 
+  git::changes {
     'app/assets/stylesheets/head.scss':
       cwd     => '/srv/leap/webapp',
       user    => 'leap-webapp';
-- 
cgit v1.2.3