diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110118/a10498e8/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110118/a10498e8/attachment-0001.html | 124 |
1 files changed, 124 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110118/a10498e8/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110118/a10498e8/attachment-0001.html new file mode 100644 index 000000000..bdfcd4687 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110118/a10498e8/attachment-0001.html @@ -0,0 +1,124 @@ +<!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>[830] - add mirrordir define</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>830</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-18 17:50:59 +0100 (Tue, 18 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre> - add mirrordir define + - use $bindir variable + - scripts owned by root:root</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesmirrormanifestsinitpp">puppet/modules/mirror/manifests/init.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesmirrormanifestsinitpp">Modified: puppet/modules/mirror/manifests/init.pp</a> +=================================================================== +--- puppet/modules/mirror/manifests/init.pp 2011-01-18 16:31:36 UTC (rev 829) ++++ puppet/modules/mirror/manifests/init.pp 2011-01-18 16:50:59 UTC (rev 830) +@@ -1,6 +1,7 @@ + class mirror { + class base { +- file { "/home/mirror/bin/": ++ $bindir = '/home/mirror/bin' ++ file { "$bindir": + ensure => directory, + owner => mirror, + group => mirror, +@@ -20,13 +21,32 @@ + } + } + ++ define mirrordir ($remotehost, $remotedir, $localdir) { ++ include base ++ file { "mirror_$name": ++ path => "$bindir/$name", ++ ensure => present, ++ owner => root, ++ group => root, ++ mode => 755, ++ content => template("mirror/mirrordir"), ++ } ++ ++ cron { "mirror_$name": ++ user => mirror, ++ minute => [0, 10, 20, 30, 40, 50], ++ command => "$bindir/$name", ++ require => File["$name"], ++ } ++ } ++ + # For main Mageia mirror + class main inherits base { + file { "update_timestamp": +- path => "/home/mirror/bin/update_timestamp", ++ path => "$bindir/update_timestamp", + ensure => present, +- owner => mirror, +- group => mirror, ++ owner => root, ++ group => root, + mode => 755, + content => template("mirror/update_timestamp") + } +@@ -35,7 +55,7 @@ + user => mirror, + hour => 10, + minute => 14, +- command => "~mirror/bin/update_timestamp", ++ command => "$bindir/update_timestamp", + require => File["update_timestamp"], + } + } + +</pre></div> + +</body> +</html>
\ No newline at end of file |