summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
m---------puppet/modules/git0
-rw-r--r--puppet/modules/site_webapp/manifests/git.pp33
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp2
3 files changed, 1 insertions, 34 deletions
diff --git a/puppet/modules/git b/puppet/modules/git
-Subproject 497a1034489e0dc3cab5dab2fb0a85778576973
+Subproject ba5dd8d5c8e09d521ff49f1ebc753601e449f82
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';