aboutsummaryrefslogtreecommitdiffstats
path: root/modules/subversion
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-19 19:51:44 +0000
committerMichael Scherer <misc@mageia.org>2012-03-19 19:51:44 +0000
commit22b50aa52fc3167415af08d0e6ee0cbbeb35e833 (patch)
tree85ddd28907b1eab63e7fc567aa7eb693f5f8cf68 /modules/subversion
parent8cb534edfa57a6a4869a5b56626cdde139e1bb3a (diff)
downloadpuppet-22b50aa52fc3167415af08d0e6ee0cbbeb35e833.tar
puppet-22b50aa52fc3167415af08d0e6ee0cbbeb35e833.tar.gz
puppet-22b50aa52fc3167415af08d0e6ee0cbbeb35e833.tar.bz2
puppet-22b50aa52fc3167415af08d0e6ee0cbbeb35e833.tar.xz
puppet-22b50aa52fc3167415af08d0e6ee0cbbeb35e833.zip
split pre_commit and post_commit in separate file, and simplify the
layout, by renaming commit_hook to hook directly
Diffstat (limited to 'modules/subversion')
-rw-r--r--modules/subversion/manifests/hook.pp31
-rw-r--r--modules/subversion/manifests/hook/post_commit.pp6
-rw-r--r--modules/subversion/manifests/hook/pre_commit.pp6
3 files changed, 19 insertions, 24 deletions
diff --git a/modules/subversion/manifests/hook.pp b/modules/subversion/manifests/hook.pp
index 5a347573..08b626ad 100644
--- a/modules/subversion/manifests/hook.pp
+++ b/modules/subversion/manifests/hook.pp
@@ -1,26 +1,9 @@
-class subversion {
- class hook {
- define post_commit($content) {
- commit_hook { $name:
- content => $content,
- type => "post-commit",
- }
- }
- define pre_commit($content) {
- commit_hook { $name:
- content => $content,
- type => "pre-commit",
- }
- }
-
- define commit_hook($content, $type) {
- $array = split($name,'\|')
- $repo = $array[0]
- $script = $array[1]
- file { "$repo/hooks/$type.d/$script":
- content => $content,
- mode => 755,
- }
- }
+define subversion::hook($content, $type) {
+ $array = split($name,'\|')
+ $repo = $array[0]
+ $script = $array[1]
+ file { "$repo/hooks/$type.d/$script":
+ content => $content,
+ mode => '0755',
}
}
diff --git a/modules/subversion/manifests/hook/post_commit.pp b/modules/subversion/manifests/hook/post_commit.pp
new file mode 100644
index 00000000..90d939cd
--- /dev/null
+++ b/modules/subversion/manifests/hook/post_commit.pp
@@ -0,0 +1,6 @@
+define subversion::hook::post_commit($content) {
+ hook { $name:
+ content => $content,
+ type => 'post-commit',
+ }
+}
diff --git a/modules/subversion/manifests/hook/pre_commit.pp b/modules/subversion/manifests/hook/pre_commit.pp
new file mode 100644
index 00000000..fa44b168
--- /dev/null
+++ b/modules/subversion/manifests/hook/pre_commit.pp
@@ -0,0 +1,6 @@
+define subversion::hook::pre_commit($content) {
+ hook { $name:
+ content => $content,
+ type => 'pre-commit',
+ }
+}