diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/2011-January/001707.html | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/2011-January/001707.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2011-January/001707.html | 186 |
1 files changed, 186 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2011-January/001707.html b/zarb-ml/mageia-sysadm/2011-January/001707.html new file mode 100644 index 000000000..9e8ae2f5c --- /dev/null +++ b/zarb-ml/mageia-sysadm/2011-January/001707.html @@ -0,0 +1,186 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [714] - change syntax for pre_commit_link, to avoid duplicated names + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B714%5D%20-%20change%20syntax%20for%20pre_commit_link%2C%0A%09to%20avoid%20duplicated%20names&In-Reply-To=%3C20110107201201.5AE4641BD0%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="001706.html"> + <LINK REL="Next" HREF="001708.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [714] - change syntax for pre_commit_link, to avoid duplicated names</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B714%5D%20-%20change%20syntax%20for%20pre_commit_link%2C%0A%09to%20avoid%20duplicated%20names&In-Reply-To=%3C20110107201201.5AE4641BD0%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [714] - change syntax for pre_commit_link, to avoid duplicated names">root at mageia.org + </A><BR> + <I>Fri Jan 7 21:12:01 CET 2011</I> + <P><UL> + <LI>Previous message: <A HREF="001706.html">[Mageia-sysadm] Puppet Report for valstar.mageia.org +</A></li> + <LI>Next message: <A HREF="001708.html">[Mageia-sysadm] Puppet Report for valstar.mageia.org +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#1707">[ date ]</a> + <a href="thread.html#1707">[ thread ]</a> + <a href="subject.html#1707">[ subject ]</a> + <a href="author.html#1707">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 714 +Author: boklm +Date: 2011-01-07 21:12:01 +0100 (Fri, 07 Jan 2011) +Log Message: +----------- +- change syntax for pre_commit_link, to avoid duplicated names +- remove syntax_check array and replace by multiple arguments as I can't find any way to avoid duplicate names when using an array + +Modified Paths: +-------------- + puppet/manifests/nodes.pp + puppet/modules/subversion/manifests/init.pp + +Modified: puppet/manifests/nodes.pp +=================================================================== +--- puppet/manifests/nodes.pp 2011-01-07 19:44:26 UTC (rev 713) ++++ puppet/manifests/nodes.pp 2011-01-07 20:12:01 UTC (rev 714) +@@ -29,7 +29,8 @@ + subversion::repository { "/svn/adm/": + group => "mga-sysadmin", + commit_mail => ['<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">mageia-sysadm at mageia.org</A>', "<A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">sysadmin-commits at ml.</A>$domain"], +- syntax_check => ['check_puppet_templates','check_puppet'], ++ syntax_check1 => 'check_puppet_templates', ++ syntax_check2 => 'check_puppet', + cia_post => true, + cia_module => "mageia-sysadm", + } + +Modified: puppet/modules/subversion/manifests/init.pp +=================================================================== +--- puppet/modules/subversion/manifests/init.pp 2011-01-07 19:44:26 UTC (rev 713) ++++ puppet/modules/subversion/manifests/init.pp 2011-01-07 20:12:01 UTC (rev 714) +@@ -98,10 +98,9 @@ + + + # FIXME ugly +- define pre_commit_link($directory) { +- file { "pre_commit_link-$directory/${name}": +- path => "$directory/$name", +- ensure => "/usr/local/share/subversion/pre-commit.d/$name", ++ define pre_commit_link($scriptname) { ++ file { "${name}": ++ ensure => "/usr/local/share/subversion/pre-commit.d/$scriptname", + owner => root, + group => root, + mode => 755, +@@ -115,7 +114,9 @@ + # group : group that have commit access on the svn + # public : boolean if the svn is readable by anybody or not + # commit_mail : array of people who will receive mail after each commit +- # syntax_check : array of pre-commit script with syntax check to add ++ # syntax_check1 : pre-commit script with syntax check to add ++ # syntax_check2 : pre-commit script with syntax check to add ++ # syntax_check3 : pre-commit script with syntax check to add + # extract_dir : hash of directory to update upon commit ( with svn update ), + # initial checkout is not handled, nor the permission + # TODO, handle the tags ( see svn::notify::mirror ) +@@ -126,7 +127,9 @@ + $cia_post = true, + $cia_module = 'default', + $no_binary = false, +- $syntax_check = '', ++ $syntax_check1 = '', ++ $syntax_check2 = '', ++ $syntax_check3 = '', + $extract_dir = '') { + # check permissions + # <A HREF="http://svnbook.red-bean.com/nightly/fr/svn.serverconfig.multimethod.html">http://svnbook.red-bean.com/nightly/fr/svn.serverconfig.multimethod.html</A> +@@ -192,8 +195,8 @@ + } + + if $no_binary { +- pre_commit_link { 'no_binary': +- directory => "$name/hooks/pre-commit.d/" ++ pre_commit_link { '$name/hooks/pre-commit.d/no_binary': ++ scriptname => 'no_binary', + } + } + +@@ -209,8 +212,29 @@ + } + + pre_commit_link { ['no_empty_message','no_root_commit', $syntax_check]: +- directory => "$name/hooks/pre-commit.d/" ++ directory => "$name/hooks/pre-commit.d/" + } ++ pre_commit_link { "$name/hooks/post-commit.d/no_empty_message": ++ scriptname => 'no_empty_message', ++ } ++ pre_commit_link { "$name/hooks/post-commit.d/no_root_commit": ++ scriptname => 'no_root_commit', ++ } ++ if $syntax_check1 { ++ pre_commit_link { "$name/hooks/post-commit.d/${syntax_check1}": ++ scriptname => $syntax_check1, ++ } ++ } ++ if $syntax_check2 { ++ pre_commit_link { "$name/hooks/post-commit.d/${syntax_check2}": ++ scriptname => $syntax_check2, ++ } ++ } ++ if $syntax_check3 { ++ pre_commit_link { "$name/hooks/post-commit.d/${syntax_check3}": ++ scriptname => $syntax_check3, ++ } ++ } + } + + +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20110107/ebf3a00a/attachment.html> +</PRE> + + + + + + + + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="001706.html">[Mageia-sysadm] Puppet Report for valstar.mageia.org +</A></li> + <LI>Next message: <A HREF="001708.html">[Mageia-sysadm] Puppet Report for valstar.mageia.org +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#1707">[ date ]</a> + <a href="thread.html#1707">[ thread ]</a> + <a href="subject.html#1707">[ subject ]</a> + <a href="author.html#1707">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |