diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101119/3d3e2d10/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101119/3d3e2d10/attachment-0001.html | 140 |
1 files changed, 140 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101119/3d3e2d10/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101119/3d3e2d10/attachment-0001.html new file mode 100644 index 000000000..85feec9e5 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101119/3d3e2d10/attachment-0001.html @@ -0,0 +1,140 @@ +<!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>[323] - try to workaround the missing feature of puppet about umask and Exec</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>323</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-19 02:00:01 +0100 (Fri, 19 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- try to workaround the missing feature of puppet about umask and Exec</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulessubversionmanifestsinitpp">puppet/modules/subversion/manifests/init.pp</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulessubversiontemplatescreate_svn_reposh">puppet/modules/subversion/templates/create_svn_repo.sh</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulessubversionmanifestsinitpp">Modified: puppet/modules/subversion/manifests/init.pp</a> +=================================================================== +--- puppet/modules/subversion/manifests/init.pp 2010-11-19 01:00:00 UTC (rev 322) ++++ puppet/modules/subversion/manifests/init.pp 2010-11-19 01:00:01 UTC (rev 323) +@@ -22,6 +22,15 @@ + ensure => directory, + } + ++ # workaround the lack of umask command in puppet < 2.7 ++ file { "/usr/local/bin/create_svn_repo.sh": ++ ensure => present, ++ owner => root, ++ group => root, ++ mode => 755, ++ content => template('subversion/create_svn_repo.sh') ++ } ++ + define syntax_check($regexp_ext,$check_cmd) { + file { "$local_dir/pre-commit.d/$name": + ensure => present, +@@ -105,7 +114,9 @@ + # $name ==> directory of the repo + include subversion::server + # TODO set umask -> requires puppet 2.7.0 +- exec { "svnadmin create $name": ++ # unfortunatly, umask is required ++ # http://projects.puppetlabs.com/issues/4424 ++ exec { "/usr/local/bin/create_svn_repo.sh $name": + user => root, + group => $group, + creates => "$name/hooks", +@@ -129,7 +140,7 @@ + group => root, + mode => 755, + content => template("subversion/hook_commit.sh"), +- require => Exec["svnadmin create $name"], ++ require => Exec["/usr/local/bin/create_svn_repo.sh $name"], + } + + file { ["$name/hooks/post-commit.d", "$name/hooks/pre-commit.d"]: +@@ -137,7 +148,7 @@ + owner => root, + group => root, + mode => 755, +- require => Exec["svnadmin create $name"], ++ require => File["$name/hooks/pre-commit"], + } + + if $commit_mail { +@@ -147,7 +158,7 @@ + group => root, + mode => 755, + content => template("subversion/hook_sendmail.pl"), +- require => [Exec["svnadmin create $name"], Package['perl-SVN-Notify-Config']], ++ require => [Package['perl-SVN-Notify-Config']], + } + } + + +<a id="puppetmodulessubversiontemplatescreate_svn_reposh">Added: puppet/modules/subversion/templates/create_svn_repo.sh</a> +=================================================================== +--- puppet/modules/subversion/templates/create_svn_repo.sh (rev 0) ++++ puppet/modules/subversion/templates/create_svn_repo.sh 2010-11-19 01:00:01 UTC (rev 323) +@@ -0,0 +1,7 @@ ++#!/bin/bash ++umask 0002 ++# needed for http://idolinux.blogspot.com/2010/05/subversion-svn-group-permissions.html ++svnadmin create --pre-1.6-compatible "$1" ++#chmod g+w "$1"/db/txn-current-lock ++#chmod g+w "$1"/db/transactions ++#chmod g+w "$1"/db/locks + +</pre></div> + +</body> +</html>
\ No newline at end of file |