diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-10-07 09:37:24 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-10-07 09:37:24 +0000 |
| commit | b269d3f46f299e1123dacbf6be25f44abe1a305b (patch) | |
| tree | 600c1f4be9b113142e7a3a21ee1287e0ebcd058e /deployment/mgagit | |
| parent | d5e0dd8658e99769b771da81fa4aeb479dbfb363 (diff) | |
| download | puppet-b269d3f46f299e1123dacbf6be25f44abe1a305b.tar puppet-b269d3f46f299e1123dacbf6be25f44abe1a305b.tar.gz puppet-b269d3f46f299e1123dacbf6be25f44abe1a305b.tar.bz2 puppet-b269d3f46f299e1123dacbf6be25f44abe1a305b.tar.xz puppet-b269d3f46f299e1123dacbf6be25f44abe1a305b.zip | |
mgagit: Keep the post commit stuff out of /usr/local/bin
Diffstat (limited to 'deployment/mgagit')
| -rw-r--r-- | deployment/mgagit/manifests/init.pp | 14 | ||||
| -rwxr-xr-x | deployment/mgagit/templates/git-post-receive-hook | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/deployment/mgagit/manifests/init.pp b/deployment/mgagit/manifests/init.pp index f440e7c9..2df95c42 100644 --- a/deployment/mgagit/manifests/init.pp +++ b/deployment/mgagit/manifests/init.pp @@ -47,12 +47,22 @@ class mgagit( content => template('mgagit/format-commit-email.sh'), } - mga_common::local_script { 'git_multimail.py': + file { "$gitolite_commonhooksdir/git_multimail.py": + ensure => present, + owner => $git_login, + group => $git_login, + mode => '0644', content => template('mgagit/git_multimail.py'), + require => File[$gitolite_commonhooksdir], } - mga_common::local_script { 'mgagit-post-receive-hook': + file { "$gitolite_commonhooksdir/post-receive": + ensure => present, + owner => $git_login, + group => $git_login, + mode => '0755', content => template('mgagit/git-post-receive-hook'), + require => File[$gitolite_commonhooksdir], } file { "$gitolite_commonhooksdir/post-update": diff --git a/deployment/mgagit/templates/git-post-receive-hook b/deployment/mgagit/templates/git-post-receive-hook index 01849ff4..72680d5a 100755 --- a/deployment/mgagit/templates/git-post-receive-hook +++ b/deployment/mgagit/templates/git-post-receive-hook @@ -4,7 +4,7 @@ import sys import os import re -LIBDIR = '/usr/local/bin' +LIBDIR = '<%= @gitolite_commonhooksdir %>' sys.path.insert(0, LIBDIR) import git_multimail |