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/attachments/20110118/add3e5f5/attachment.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/attachments/20110118/add3e5f5/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110118/add3e5f5/attachment.html | 142 |
1 files changed, 142 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110118/add3e5f5/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110118/add3e5f5/attachment.html new file mode 100644 index 000000000..fe7007509 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110118/add3e5f5/attachment.html @@ -0,0 +1,142 @@ +<!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>[841] add mirrordir script and mirrorbootstrap class</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>841</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-18 19:21:44 +0100 (Tue, 18 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add mirrordir script and mirrorbootstrap class</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesmirrormanifestsinitpp">puppet/modules/mirror/manifests/init.pp</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulesmirrortemplatesmirrordir">puppet/modules/mirror/templates/mirrordir</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 18:03:15 UTC (rev 840) ++++ puppet/modules/mirror/manifests/init.pp 2011-01-18 18:21:44 UTC (rev 841) +@@ -1,6 +1,7 @@ + class mirror { + class base { + $bindir = '/home/mirror/bin' ++ $locksdir = '/home/mirror/locks' + file { "$bindir": + ensure => directory, + owner => mirror, +@@ -8,6 +9,13 @@ + mode => 755 + } + ++ file { "$locksdir": ++ ensure => directory, ++ owner => mirror, ++ group => mirror, ++ mode => 755 ++ } ++ + group {"mirror": + ensure => present, + } +@@ -21,8 +29,15 @@ + } + } + +- define mirrordir ($remotehost, $remotedir, $localdir) { ++ define mirrordir ($remoteurl, $localdir, $rsync_options="-avH --delete") { + include base ++ lockfile="$locksdir/$name" ++ file { "$localdir": ++ ensure => directory, ++ owner => mirror, ++ group => mirror, ++ mode => 755, ++ } + file { "mirror_$name": + path => "$bindir/$name", + ensure => present, +@@ -59,4 +74,11 @@ + require => File["update_timestamp"], + } + } ++ ++ class mirrorbootstrap inherits base { ++ mirrordir { "bootstrap": ++ remoteurl => 'rsync://valstar.mageia.org/bootstrap', ++ localdir => '/distrib/bootstrap', ++ } ++ } + } + +<a id="puppetmodulesmirrortemplatesmirrordir">Added: puppet/modules/mirror/templates/mirrordir</a> +=================================================================== +--- puppet/modules/mirror/templates/mirrordir (rev 0) ++++ puppet/modules/mirror/templates/mirrordir 2011-01-18 18:21:44 UTC (rev 841) +@@ -0,0 +1,12 @@ ++#!/bin/sh ++ ++remoteurl="<%= remoteurl%>" ++localdir="<%= localdir %>" ++rsync_options="<%= rsync_options %>" ++lockfile="<%= lockfile %>" ++ ++test -f "$lockfile" && exit ++touch "$lockfile" ++/usr/bin/rsync $rsync_options "$remoteurl" "$localdir" ++rm -f "$lockfile" ++ + +</pre></div> + +</body> +</html>
\ No newline at end of file |