move git::changes into git module, whitespace fix

2 files changed, 1 insertions, 34 deletions

diff --git a/puppet/modules/site_webapp/manifests/git.pp b/puppet/modules/site_webapp/manifests/git.pp
deleted file mode 100644
index 908bc1a4..00000000
--- a/puppet/modules/site_webapp/manifests/git.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# Usage
-# git::changes { name:
-#   cwd    =>  "/path/to/git/"
-#   user   =>  "me",
-#   ensure =>  {*assume-unchanged*, tracked}
-# }
-#
-
-define git::changes ( $cwd, $user, $ensure='assume-unchanged' ) {
-
-  case $ensure {
-    default: { err ( "unknown ensure value '${ensure}'" ) }
-
-    assume-unchanged: {
-      exec { "assume-unchanged ${name}":
-        command => "/usr/bin/git update-index --assume-unchanged ${name}",
-        cwd     => $cwd,
-        user    => $user,
-        unless  => "/usr/bin/git ls-files -v | grep '^[ch] ${name}'",
-      }
-    }
-    
-    tracked: {
-      exec { "assume-unchanged ${name}":
-        command => "/usr/bin/git update-index --no-assume-unchanged ${name}",
-        cwd     => $cwd,
-        user    => $user,
-        onlyif  => "/usr/bin/git ls-files -v | grep '^[ch] ${name}'",
-      }
-    }
-  }
-}
-
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';