diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110107/ebf3a00a/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110107/ebf3a00a/attachment-0001.html | 163 |
1 files changed, 163 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110107/ebf3a00a/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110107/ebf3a00a/attachment-0001.html new file mode 100644 index 000000000..809c295a5 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110107/ebf3a00a/attachment-0001.html @@ -0,0 +1,163 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[714] - change syntax for pre_commit_link, to avoid duplicated names</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>714</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-07 21:12:01 +0100 (Fri, 07 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- 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</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +<li><a href="#puppetmodulessubversionmanifestsinitpp">puppet/modules/subversion/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- 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 => ['mageia-sysadm@mageia.org', "sysadmin-commits@ml.$domain"], +- syntax_check => ['check_puppet_templates','check_puppet'], ++ syntax_check1 => 'check_puppet_templates', ++ syntax_check2 => 'check_puppet', + cia_post => true, + cia_module => "mageia-sysadm", + } + +<a id="puppetmodulessubversionmanifestsinitpp">Modified: puppet/modules/subversion/manifests/init.pp</a> +=================================================================== +--- 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 + # http://svnbook.red-bean.com/nightly/fr/svn.serverconfig.multimethod.html +@@ -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, ++ } ++ } + } + + + +</pre></div> + +</body> +</html>
\ No newline at end of file |