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/20110108 | |
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/20110108')
42 files changed, 3756 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/11c31cde/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/11c31cde/attachment-0001.html new file mode 100644 index 000000000..34c954e4f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/11c31cde/attachment-0001.html @@ -0,0 +1,77 @@ +<!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>[729] really use dot in distsuffix</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>729</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 16:35:51 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>really use dot in distsuffix</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesrepsysconf">puppet/modules/buildsystem/templates/repsys.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatesrepsysconf">Modified: puppet/modules/buildsystem/templates/repsys.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 14:43:55 UTC (rev 728) ++++ puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 15:35:51 UTC (rev 729) +@@ -43,7 +43,7 @@ + rpm-macros = global cauldron + + [macros global] +-distsuffix = mga ++distsuffix = .mga + # mkrel definition to be removed when rpm-setup is updated on main build node + mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} + distribution = Mageia + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/11c31cde/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/11c31cde/attachment.html new file mode 100644 index 000000000..34c954e4f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/11c31cde/attachment.html @@ -0,0 +1,77 @@ +<!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>[729] really use dot in distsuffix</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>729</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 16:35:51 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>really use dot in distsuffix</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesrepsysconf">puppet/modules/buildsystem/templates/repsys.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatesrepsysconf">Modified: puppet/modules/buildsystem/templates/repsys.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 14:43:55 UTC (rev 728) ++++ puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 15:35:51 UTC (rev 729) +@@ -43,7 +43,7 @@ + rpm-macros = global cauldron + + [macros global] +-distsuffix = mga ++distsuffix = .mga + # mkrel definition to be removed when rpm-setup is updated on main build node + mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} + distribution = Mageia + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/1b2ef07c/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/1b2ef07c/attachment-0001.html new file mode 100644 index 000000000..af1f4b44e --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/1b2ef07c/attachment-0001.html @@ -0,0 +1,86 @@ +<!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>[721] use spaces, not tabs</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>721</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 10:08:37 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>use spaces, not tabs</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatessubmituploadconf">Modified: puppet/modules/buildsystem/templates/submit-upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 08:51:02 UTC (rev 720) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:08:37 UTC (rev 721) +@@ -37,7 +37,7 @@ + # - mail + # - archive + - clean +- posts: ++ posts: + - genhdlist2 + + 1: +@@ -56,7 +56,7 @@ + # - mail + # - archive + - clean +- posts: ++ posts: + - genhdlist2 + + # checks definition + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/1b2ef07c/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/1b2ef07c/attachment.html new file mode 100644 index 000000000..af1f4b44e --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/1b2ef07c/attachment.html @@ -0,0 +1,86 @@ +<!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>[721] use spaces, not tabs</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>721</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 10:08:37 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>use spaces, not tabs</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatessubmituploadconf">Modified: puppet/modules/buildsystem/templates/submit-upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 08:51:02 UTC (rev 720) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:08:37 UTC (rev 721) +@@ -37,7 +37,7 @@ + # - mail + # - archive + - clean +- posts: ++ posts: + - genhdlist2 + + 1: +@@ -56,7 +56,7 @@ + # - mail + # - archive + - clean +- posts: ++ posts: + - genhdlist2 + + # checks definition + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/2151dd3b/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/2151dd3b/attachment-0001.html new file mode 100644 index 000000000..1446a3c48 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/2151dd3b/attachment-0001.html @@ -0,0 +1,77 @@ +<!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>[724] add dot before distsuffix in release</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>724</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 11:29:09 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add dot before distsuffix in release</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesrepsysconf">puppet/modules/buildsystem/templates/repsys.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatesrepsysconf">Modified: puppet/modules/buildsystem/templates/repsys.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 09:33:16 UTC (rev 723) ++++ puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 10:29:09 UTC (rev 724) +@@ -45,7 +45,7 @@ + [macros global] + distsuffix = mga + # mkrel definition to be removed when rpm-setup is updated on main build node +-mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:mga}%{?distro_release:%distro_release} ++mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}.%{?distsuffix:%distsuffix}%{?!distsuffix:mga}%{?distro_release:%distro_release} + distribution = Mageia + vendor = Mageia.Org + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/2151dd3b/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/2151dd3b/attachment.html new file mode 100644 index 000000000..1446a3c48 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/2151dd3b/attachment.html @@ -0,0 +1,77 @@ +<!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>[724] add dot before distsuffix in release</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>724</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 11:29:09 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add dot before distsuffix in release</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesrepsysconf">puppet/modules/buildsystem/templates/repsys.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatesrepsysconf">Modified: puppet/modules/buildsystem/templates/repsys.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 09:33:16 UTC (rev 723) ++++ puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 10:29:09 UTC (rev 724) +@@ -45,7 +45,7 @@ + [macros global] + distsuffix = mga + # mkrel definition to be removed when rpm-setup is updated on main build node +-mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:mga}%{?distro_release:%distro_release} ++mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}.%{?distsuffix:%distsuffix}%{?!distsuffix:mga}%{?distro_release:%distro_release} + distribution = Mageia + vendor = Mageia.Org + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/2617fa12/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/2617fa12/attachment-0001.html new file mode 100644 index 000000000..40d5f04a8 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/2617fa12/attachment-0001.html @@ -0,0 +1,78 @@ +<!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>[252] add other extentions for binary files</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>252</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-08 17:58:12 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add other extentions for binary files</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemmgarepotrunkRepSysbinrepopy">build_system/mgarepo/trunk/RepSys/binrepo.py</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemmgarepotrunkRepSysbinrepopy">Modified: build_system/mgarepo/trunk/RepSys/binrepo.py</a> +=================================================================== +--- build_system/mgarepo/trunk/RepSys/binrepo.py 2011-01-08 00:00:32 UTC (rev 251) ++++ build_system/mgarepo/trunk/RepSys/binrepo.py 2011-01-08 16:58:12 UTC (rev 252) +@@ -107,7 +107,8 @@ + raw = config.get("binrepo", "upload-match", + "\.(7z|Z|bin|bz2|cpio|db|deb|egg|gem|gz|jar|jisp|lzma|"\ + "pdf|pgn\\.gz|pk3|rpm|rpm|run|sdz|smzip|tar|tbz|"\ +- "tbz2|tgz|ttf|uqm|wad|war|xar|xpi|xz|zip)$") ++ "tbz2|tgz|ttf|uqm|wad|war|xar|xpi|xz|zip|wav|mp3|ogg|"\ ++ "jpg|png|gif)$") + maxsize = config.getint("binrepo", "upload-match-size", "1048576") # 1MiB + expr = re.compile(raw) + name = os.path.basename(path) + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/2617fa12/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/2617fa12/attachment.html new file mode 100644 index 000000000..40d5f04a8 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/2617fa12/attachment.html @@ -0,0 +1,78 @@ +<!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>[252] add other extentions for binary files</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>252</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-08 17:58:12 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add other extentions for binary files</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemmgarepotrunkRepSysbinrepopy">build_system/mgarepo/trunk/RepSys/binrepo.py</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemmgarepotrunkRepSysbinrepopy">Modified: build_system/mgarepo/trunk/RepSys/binrepo.py</a> +=================================================================== +--- build_system/mgarepo/trunk/RepSys/binrepo.py 2011-01-08 00:00:32 UTC (rev 251) ++++ build_system/mgarepo/trunk/RepSys/binrepo.py 2011-01-08 16:58:12 UTC (rev 252) +@@ -107,7 +107,8 @@ + raw = config.get("binrepo", "upload-match", + "\.(7z|Z|bin|bz2|cpio|db|deb|egg|gem|gz|jar|jisp|lzma|"\ + "pdf|pgn\\.gz|pk3|rpm|rpm|run|sdz|smzip|tar|tbz|"\ +- "tbz2|tgz|ttf|uqm|wad|war|xar|xpi|xz|zip)$") ++ "tbz2|tgz|ttf|uqm|wad|war|xar|xpi|xz|zip|wav|mp3|ogg|"\ ++ "jpg|png|gif)$") + maxsize = config.getint("binrepo", "upload-match-size", "1048576") # 1MiB + expr = re.compile(raw) + name = os.path.basename(path) + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/26f1002f/attachment-0001.asc b/zarb-ml/mageia-sysadm/attachments/20110108/26f1002f/attachment-0001.asc new file mode 100644 index 000000000..2d08ed893 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/26f1002f/attachment-0001.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAk0oeR4ACgkQk29cDOWzfVDhQwCg2RIVP9Libapwmgv4JD/Ok+Nb +Ja8AnR+TUYdDgdLaJMozgWSJoM8uCBtQ +=8Tqh +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/26f1002f/attachment.asc b/zarb-ml/mageia-sysadm/attachments/20110108/26f1002f/attachment.asc new file mode 100644 index 000000000..2d08ed893 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/26f1002f/attachment.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAk0oeR4ACgkQk29cDOWzfVDhQwCg2RIVP9Libapwmgv4JD/Ok+Nb +Ja8AnR+TUYdDgdLaJMozgWSJoM8uCBtQ +=8Tqh +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/359ad8f0/attachment-0001.asc b/zarb-ml/mageia-sysadm/attachments/20110108/359ad8f0/attachment-0001.asc new file mode 100644 index 000000000..cb8e1b192 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/359ad8f0/attachment-0001.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAk0oi4UACgkQk29cDOWzfVBPzQCeN6t96BsMX1oo2zunPE9308FO +McQAoO2fLKeU2/MPXSGnut8rgqJxjqJL +=djDq +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/359ad8f0/attachment.asc b/zarb-ml/mageia-sysadm/attachments/20110108/359ad8f0/attachment.asc new file mode 100644 index 000000000..cb8e1b192 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/359ad8f0/attachment.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAk0oi4UACgkQk29cDOWzfVBPzQCeN6t96BsMX1oo2zunPE9308FO +McQAoO2fLKeU2/MPXSGnut8rgqJxjqJL +=djDq +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/3a29186e/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/3a29186e/attachment-0001.html new file mode 100644 index 000000000..a8ab68375 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/3a29186e/attachment-0001.html @@ -0,0 +1,84 @@ +<!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>[730] report are sent by the puppetmaster, so the configuration of mail sending should on master side</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>730</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2011-01-08 22:13:08 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>report are sent by the puppetmaster, so the configuration of mail sending should on master side</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulespuppettemplatespuppetconf">puppet/modules/puppet/templates/puppet.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulespuppettemplatespuppetconf">Modified: puppet/modules/puppet/templates/puppet.conf</a> +=================================================================== +--- puppet/modules/puppet/templates/puppet.conf 2011-01-08 15:35:51 UTC (rev 729) ++++ puppet/modules/puppet/templates/puppet.conf 2011-01-08 21:13:08 UTC (rev 730) +@@ -17,6 +17,7 @@ + # tagmail should be kept last, until this bug is fixed + # https://projects.puppetlabs.com/issues/5018 + reports = store,tagmail ++ reportfrom = root@<%= domain %> + + storeconfigs = true + dbadapter = sqlite3 +@@ -33,7 +34,6 @@ + splay = true + + report = true +- reportfrom = root@<%= domain %> + + # The file in which puppetd stores a list of the classes + # associated with the retrieved configuratiion. Can be loaded in + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/3a29186e/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/3a29186e/attachment.html new file mode 100644 index 000000000..a8ab68375 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/3a29186e/attachment.html @@ -0,0 +1,84 @@ +<!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>[730] report are sent by the puppetmaster, so the configuration of mail sending should on master side</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>730</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2011-01-08 22:13:08 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>report are sent by the puppetmaster, so the configuration of mail sending should on master side</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulespuppettemplatespuppetconf">puppet/modules/puppet/templates/puppet.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulespuppettemplatespuppetconf">Modified: puppet/modules/puppet/templates/puppet.conf</a> +=================================================================== +--- puppet/modules/puppet/templates/puppet.conf 2011-01-08 15:35:51 UTC (rev 729) ++++ puppet/modules/puppet/templates/puppet.conf 2011-01-08 21:13:08 UTC (rev 730) +@@ -17,6 +17,7 @@ + # tagmail should be kept last, until this bug is fixed + # https://projects.puppetlabs.com/issues/5018 + reports = store,tagmail ++ reportfrom = root@<%= domain %> + + storeconfigs = true + dbadapter = sqlite3 +@@ -33,7 +34,6 @@ + splay = true + + report = true +- reportfrom = root@<%= domain %> + + # The file in which puppetd stores a list of the classes + # associated with the retrieved configuratiion. Can be loaded in + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/5ada3f25/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/5ada3f25/attachment-0001.html new file mode 100644 index 000000000..b823517dc --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/5ada3f25/attachment-0001.html @@ -0,0 +1,89 @@ +<!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>[722] fix back module 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>722</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 10:23:36 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix back module names</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatessubmituploadconf">Modified: puppet/modules/buildsystem/templates/submit-upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:08:37 UTC (rev 721) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:23:36 UTC (rev 722) +@@ -155,16 +155,16 @@ + class: Youri::Submit::Action::Install + + markrelease: +- class: Youri::Upload::Action::Markrelease ++ class: Youri::Submit::Action::Markrelease + + link: +- class: Youri::Upload::Action::Link ++ class: Youri::Submit::Action::Link + + archive: +- class: Youri::Upload::Action::Archive ++ class: Youri::Submit::Action::Archive + + clean: +- class: Youri::Upload::Action::Clean ++ class: Youri::Submit::Action::Clean + + genhdlist2: + class: Youri::Submit::Post::Genhdlist2 + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/5ada3f25/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/5ada3f25/attachment.html new file mode 100644 index 000000000..b823517dc --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/5ada3f25/attachment.html @@ -0,0 +1,89 @@ +<!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>[722] fix back module 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>722</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 10:23:36 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>fix back module names</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatessubmituploadconf">Modified: puppet/modules/buildsystem/templates/submit-upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:08:37 UTC (rev 721) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:23:36 UTC (rev 722) +@@ -155,16 +155,16 @@ + class: Youri::Submit::Action::Install + + markrelease: +- class: Youri::Upload::Action::Markrelease ++ class: Youri::Submit::Action::Markrelease + + link: +- class: Youri::Upload::Action::Link ++ class: Youri::Submit::Action::Link + + archive: +- class: Youri::Upload::Action::Archive ++ class: Youri::Submit::Action::Archive + + clean: +- class: Youri::Upload::Action::Clean ++ class: Youri::Submit::Action::Clean + + genhdlist2: + class: Youri::Submit::Post::Genhdlist2 + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/762c3c42/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/762c3c42/attachment-0001.html new file mode 100644 index 000000000..8ae71bc5f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/762c3c42/attachment-0001.html @@ -0,0 +1,79 @@ +<!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>[727] add documentation</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>727</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-08 15:40:17 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add documentation</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulessubversionmanifestsinitpp">puppet/modules/subversion/manifests/init.pp</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 2011-01-08 14:37:48 UTC (rev 726) ++++ puppet/modules/subversion/manifests/init.pp 2011-01-08 14:40:17 UTC (rev 727) +@@ -114,6 +114,10 @@ + # 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 ++ # cia_post : send commits to cia.vc ++ # cia_module : name of the module to send to cia.vc ++ # cia_ignore_author : a regexp to ignore commits from some authors ++ # no_binary : do not accept files with common binary extentions on this repository + # 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 + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/762c3c42/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/762c3c42/attachment.html new file mode 100644 index 000000000..8ae71bc5f --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/762c3c42/attachment.html @@ -0,0 +1,79 @@ +<!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>[727] add documentation</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>727</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-08 15:40:17 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add documentation</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulessubversionmanifestsinitpp">puppet/modules/subversion/manifests/init.pp</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 2011-01-08 14:37:48 UTC (rev 726) ++++ puppet/modules/subversion/manifests/init.pp 2011-01-08 14:40:17 UTC (rev 727) +@@ -114,6 +114,10 @@ + # 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 ++ # cia_post : send commits to cia.vc ++ # cia_module : name of the module to send to cia.vc ++ # cia_ignore_author : a regexp to ignore commits from some authors ++ # no_binary : do not accept files with common binary extentions on this repository + # 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 + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/77808050/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/77808050/attachment-0001.html new file mode 100644 index 000000000..bc2cae345 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/77808050/attachment-0001.html @@ -0,0 +1,77 @@ +<!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>[251] FIx wording</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>251</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2011-01-08 01:00:32 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>FIx wording</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunklibCatDapControllerforgot_passwordpm">identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunklibCatDapControllerforgot_passwordpm">Modified: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm</a> +=================================================================== +--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm 2011-01-07 23:20:38 UTC (rev 250) ++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm 2011-01-08 00:00:32 UTC (rev 251) +@@ -158,7 +158,7 @@ + if ($c->req->param('newpassword1') eq $c->req->param('newpassword2')) { + $newpass = $c->req->param('newpassword1'); + } else { +- push @errors, "New passwords dont match"; ++ push @errors, "New passwords do not match"; + } + # if error show confirm page again to retry + if (@errors) { + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/77808050/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/77808050/attachment.html new file mode 100644 index 000000000..bc2cae345 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/77808050/attachment.html @@ -0,0 +1,77 @@ +<!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>[251] FIx wording</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>251</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2011-01-08 01:00:32 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>FIx wording</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunklibCatDapControllerforgot_passwordpm">identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunklibCatDapControllerforgot_passwordpm">Modified: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm</a> +=================================================================== +--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm 2011-01-07 23:20:38 UTC (rev 250) ++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm 2011-01-08 00:00:32 UTC (rev 251) +@@ -158,7 +158,7 @@ + if ($c->req->param('newpassword1') eq $c->req->param('newpassword2')) { + $newpass = $c->req->param('newpassword1'); + } else { +- push @errors, "New passwords dont match"; ++ push @errors, "New passwords do not match"; + } + # if error show confirm page again to retry + if (@errors) { + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/7af6c065/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/7af6c065/attachment-0001.html new file mode 100644 index 000000000..8ae76822b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/7af6c065/attachment-0001.html @@ -0,0 +1,101 @@ +<!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>[726] add an option to not send commits from some authors to cia</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>726</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-08 15:37:48 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add an option to not send commits from some authors to cia</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulessubversionmanifestsinitpp">puppet/modules/subversion/manifests/init.pp</a></li> +<li><a href="#puppetmodulessubversiontemplatesciabot_svnsh">puppet/modules/subversion/templates/ciabot_svn.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 2011-01-08 10:32:00 UTC (rev 725) ++++ puppet/modules/subversion/manifests/init.pp 2011-01-08 14:37:48 UTC (rev 726) +@@ -126,6 +126,7 @@ + $commit_mail = '', + $cia_post = true, + $cia_module = 'default', ++ $cia_ignore_author = '', + $no_binary = false, + $syntax_check1 = '', + $syntax_check2 = '', + +<a id="puppetmodulessubversiontemplatesciabot_svnsh">Modified: puppet/modules/subversion/templates/ciabot_svn.sh</a> +=================================================================== +--- puppet/modules/subversion/templates/ciabot_svn.sh 2011-01-08 10:32:00 UTC (rev 725) ++++ puppet/modules/subversion/templates/ciabot_svn.sh 2011-01-08 14:37:48 UTC (rev 726) +@@ -66,6 +66,7 @@ + project_name="Mageia" + module_name="<%= cia_module %>" + return_address="root@<%= domain %>" ++ignore_author="<%= cia_ignore_author %>" + + # System + sendmail_command="/usr/sbin/sendmail -t" +@@ -80,6 +81,10 @@ + cia_address="cia@cia.navi.cx" + + author=`svnlook author -r "$REV" "$REPOS" | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'` ++if test -n "$ignore_author" && echo "$author" | grep -q "$ignore_author" ++then ++ exit 0 ++fi + log=`svnlook log -r "$REV" "$REPOS" | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'` + diff_lines=`svnlook diff -r "$REV" "$REPOS" | wc -l` + for file in `svnlook changed -r "$REV" "$REPOS" | cut -c 3- | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'`; do + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/7af6c065/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/7af6c065/attachment.html new file mode 100644 index 000000000..8ae76822b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/7af6c065/attachment.html @@ -0,0 +1,101 @@ +<!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>[726] add an option to not send commits from some authors to cia</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>726</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-08 15:37:48 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add an option to not send commits from some authors to cia</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulessubversionmanifestsinitpp">puppet/modules/subversion/manifests/init.pp</a></li> +<li><a href="#puppetmodulessubversiontemplatesciabot_svnsh">puppet/modules/subversion/templates/ciabot_svn.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 2011-01-08 10:32:00 UTC (rev 725) ++++ puppet/modules/subversion/manifests/init.pp 2011-01-08 14:37:48 UTC (rev 726) +@@ -126,6 +126,7 @@ + $commit_mail = '', + $cia_post = true, + $cia_module = 'default', ++ $cia_ignore_author = '', + $no_binary = false, + $syntax_check1 = '', + $syntax_check2 = '', + +<a id="puppetmodulessubversiontemplatesciabot_svnsh">Modified: puppet/modules/subversion/templates/ciabot_svn.sh</a> +=================================================================== +--- puppet/modules/subversion/templates/ciabot_svn.sh 2011-01-08 10:32:00 UTC (rev 725) ++++ puppet/modules/subversion/templates/ciabot_svn.sh 2011-01-08 14:37:48 UTC (rev 726) +@@ -66,6 +66,7 @@ + project_name="Mageia" + module_name="<%= cia_module %>" + return_address="root@<%= domain %>" ++ignore_author="<%= cia_ignore_author %>" + + # System + sendmail_command="/usr/sbin/sendmail -t" +@@ -80,6 +81,10 @@ + cia_address="cia@cia.navi.cx" + + author=`svnlook author -r "$REV" "$REPOS" | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'` ++if test -n "$ignore_author" && echo "$author" | grep -q "$ignore_author" ++then ++ exit 0 ++fi + log=`svnlook log -r "$REV" "$REPOS" | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'` + diff_lines=`svnlook diff -r "$REV" "$REPOS" | wc -l` + for file in `svnlook changed -r "$REV" "$REPOS" | cut -c 3- | sed 's/\&/\&amp;/g;s/</\&lt;/g;s/>/\&gt;/g'`; do + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/a02d48d9/attachment-0001.pub b/zarb-ml/mageia-sysadm/attachments/20110108/a02d48d9/attachment-0001.pub new file mode 100644 index 000000000..f4b596982 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/a02d48d9/attachment-0001.pub @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAACBAOemkGVzf4qAzd3KYl89C+BZpPp/uxPqwj9BV3sVT1JZ9En4Wl5vRZi23WA6+vL+jnPCC29WKwEituTQkoIgcInEAJ2duwLO7OpW3lvkvvyy6ZrpVn9AUNL2i2ADiWW87JSRi8mjv97uOKaneR07QRV6I9JmWfM/yl5X3sXf62zRAAAAFQCG6MWQyZtHM5GuJP0Dj0trT8Yh6wAAAIEAyHqWL/CRo3hOJX0uf/sQaunuXfnaFUAwArJZFL7GOib1n8fw83Yz4fRpHzdWnMdfULMDVfIeIDmKyCcQooDbMc86hfap0piXM7BjIDDUgTdKdZIaBEzCYtJ01SG/KSzOS90l53IKJWiCmL/XN6lwOJCTwGydnQyvtnv2qEisA9UAAACAREYo9jG48xsEBT+cndU6wk8sWkbkfpL4JZYGhAvx51Mi0tix1906Ljz1yPtGezMV7RKMYiqZoKDeooCEp3Kpnqdkq1fUsnj1p52QeFhXiN87S8FtYdeKYSLVC0rhfWbedTf3DUiWFV2Ba8FFPx3bLXZ48eCX1SQkapflcAblxHg= spuhler@aargau.btspuhler.com
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/a02d48d9/attachment.pub b/zarb-ml/mageia-sysadm/attachments/20110108/a02d48d9/attachment.pub new file mode 100644 index 000000000..f4b596982 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/a02d48d9/attachment.pub @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAACBAOemkGVzf4qAzd3KYl89C+BZpPp/uxPqwj9BV3sVT1JZ9En4Wl5vRZi23WA6+vL+jnPCC29WKwEituTQkoIgcInEAJ2duwLO7OpW3lvkvvyy6ZrpVn9AUNL2i2ADiWW87JSRi8mjv97uOKaneR07QRV6I9JmWfM/yl5X3sXf62zRAAAAFQCG6MWQyZtHM5GuJP0Dj0trT8Yh6wAAAIEAyHqWL/CRo3hOJX0uf/sQaunuXfnaFUAwArJZFL7GOib1n8fw83Yz4fRpHzdWnMdfULMDVfIeIDmKyCcQooDbMc86hfap0piXM7BjIDDUgTdKdZIaBEzCYtJ01SG/KSzOS90l53IKJWiCmL/XN6lwOJCTwGydnQyvtnv2qEisA9UAAACAREYo9jG48xsEBT+cndU6wk8sWkbkfpL4JZYGhAvx51Mi0tix1906Ljz1yPtGezMV7RKMYiqZoKDeooCEp3Kpnqdkq1fUsnj1p52QeFhXiN87S8FtYdeKYSLVC0rhfWbedTf3DUiWFV2Ba8FFPx3bLXZ48eCX1SQkapflcAblxHg= spuhler@aargau.btspuhler.com
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/a38f30f6/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/a38f30f6/attachment-0001.html new file mode 100644 index 000000000..f7bb58313 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/a38f30f6/attachment-0001.html @@ -0,0 +1,76 @@ +<!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>[723] genhdlist2 is a post, not an action</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>723</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 10:33:16 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>genhdlist2 is a post, not an action</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatessubmituploadconf">Modified: puppet/modules/buildsystem/templates/submit-upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:23:36 UTC (rev 722) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:33:16 UTC (rev 723) +@@ -166,6 +166,7 @@ + clean: + class: Youri::Submit::Action::Clean + ++posts: + genhdlist2: + class: Youri::Submit::Post::Genhdlist2 + options: + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/a38f30f6/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/a38f30f6/attachment.html new file mode 100644 index 000000000..f7bb58313 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/a38f30f6/attachment.html @@ -0,0 +1,76 @@ +<!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>[723] genhdlist2 is a post, not an action</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>723</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 10:33:16 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>genhdlist2 is a post, not an action</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatessubmituploadconf">Modified: puppet/modules/buildsystem/templates/submit-upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:23:36 UTC (rev 722) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 09:33:16 UTC (rev 723) +@@ -166,6 +166,7 @@ + clean: + class: Youri::Submit::Action::Clean + ++posts: + genhdlist2: + class: Youri::Submit::Post::Genhdlist2 + options: + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/abf0a357/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/abf0a357/attachment-0001.html new file mode 100644 index 000000000..22fa77eb2 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/abf0a357/attachment-0001.html @@ -0,0 +1,77 @@ +<!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>[725] put the dot in distsuffix</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>725</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 11:32:00 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>put the dot in distsuffix</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesrepsysconf">puppet/modules/buildsystem/templates/repsys.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatesrepsysconf">Modified: puppet/modules/buildsystem/templates/repsys.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 10:29:09 UTC (rev 724) ++++ puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 10:32:00 UTC (rev 725) +@@ -45,7 +45,7 @@ + [macros global] + distsuffix = mga + # mkrel definition to be removed when rpm-setup is updated on main build node +-mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}.%{?distsuffix:%distsuffix}%{?!distsuffix:mga}%{?distro_release:%distro_release} ++mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} + distribution = Mageia + vendor = Mageia.Org + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/abf0a357/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/abf0a357/attachment.html new file mode 100644 index 000000000..22fa77eb2 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/abf0a357/attachment.html @@ -0,0 +1,77 @@ +<!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>[725] put the dot in distsuffix</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>725</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 11:32:00 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>put the dot in distsuffix</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesrepsysconf">puppet/modules/buildsystem/templates/repsys.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatesrepsysconf">Modified: puppet/modules/buildsystem/templates/repsys.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 10:29:09 UTC (rev 724) ++++ puppet/modules/buildsystem/templates/repsys.conf 2011-01-08 10:32:00 UTC (rev 725) +@@ -45,7 +45,7 @@ + [macros global] + distsuffix = mga + # mkrel definition to be removed when rpm-setup is updated on main build node +-mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}.%{?distsuffix:%distsuffix}%{?!distsuffix:mga}%{?distro_release:%distro_release} ++mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} + distribution = Mageia + vendor = Mageia.Org + + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/d6519521/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/d6519521/attachment-0001.html new file mode 100644 index 000000000..dc3b2504b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/d6519521/attachment-0001.html @@ -0,0 +1,76 @@ +<!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>[250] update footer links</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>250</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-08 00:20:38 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>update footer links</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkroottemplatefooter">identity/CatDap/trunk/root/template/footer</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunkroottemplatefooter">Modified: identity/CatDap/trunk/root/template/footer</a> +=================================================================== +--- identity/CatDap/trunk/root/template/footer 2011-01-07 23:20:14 UTC (rev 249) ++++ identity/CatDap/trunk/root/template/footer 2011-01-07 23:20:38 UTC (rev 250) +@@ -1,5 +1,5 @@ + <div class="hnav"> + <div align=center><p>2010 <a href="http://mageia.org/">Mageia.org</a> +- | <a href="http://mageia.org/policies/privacy/">Privacy policy</a> +- | <a href="http://mageia.org/faq/accounts/">Mageia user accounts FAQ</a> ++ | <a href="http://mageia.org/en/about/policies/privacy/">Privacy policy</a> ++ | <a href="http://mageia.org/wiki/doku.php?id=faq:accounts">Mageia user accounts FAQ</a> + </p></div></div> + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/d6519521/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/d6519521/attachment.html new file mode 100644 index 000000000..dc3b2504b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/d6519521/attachment.html @@ -0,0 +1,76 @@ +<!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>[250] update footer links</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>250</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-08 00:20:38 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>update footer links</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkroottemplatefooter">identity/CatDap/trunk/root/template/footer</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunkroottemplatefooter">Modified: identity/CatDap/trunk/root/template/footer</a> +=================================================================== +--- identity/CatDap/trunk/root/template/footer 2011-01-07 23:20:14 UTC (rev 249) ++++ identity/CatDap/trunk/root/template/footer 2011-01-07 23:20:38 UTC (rev 250) +@@ -1,5 +1,5 @@ + <div class="hnav"> + <div align=center><p>2010 <a href="http://mageia.org/">Mageia.org</a> +- | <a href="http://mageia.org/policies/privacy/">Privacy policy</a> +- | <a href="http://mageia.org/faq/accounts/">Mageia user accounts FAQ</a> ++ | <a href="http://mageia.org/en/about/policies/privacy/">Privacy policy</a> ++ | <a href="http://mageia.org/wiki/doku.php?id=faq:accounts">Mageia user accounts FAQ</a> + </p></div></div> + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/d8eafeac/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/d8eafeac/attachment-0001.html new file mode 100644 index 000000000..011f42469 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/d8eafeac/attachment-0001.html @@ -0,0 +1,136 @@ +<!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>[248] commit spec file from Maarten Vanraes</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>248</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-08 00:15:42 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>commit spec file from Maarten Vanraes</pre> + +<h3>Added Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkCatDapspec">identity/CatDap/trunk/CatDap.spec</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunkCatDapspec">Added: identity/CatDap/trunk/CatDap.spec</a> +=================================================================== +--- identity/CatDap/trunk/CatDap.spec (rev 0) ++++ identity/CatDap/trunk/CatDap.spec 2011-01-07 23:15:42 UTC (rev 248) +@@ -0,0 +1,67 @@ ++%define upstream_name CatDap ++%define upstream_version 0.0.1-r200 ++ ++Name: perl-%{upstream_name} ++Version: %perl_convert_version %{upstream_version} ++Release: %mkrel 1 ++Summary: Web Based LDAP Administration Program ++License: GPL+ or Artistic ++Group: System/Configuration/Other ++Url: http://www.mageia.org/wiki/doku.php?id=web:identity ++Source0: %{upstream_name}-%{upstream_version}.tar.bz2 ++BuildRequires: perl(Module::Install) ++BuildRequires: perl(Module::Install::Catalyst) ++BuildRequires: perl(Catalyst::Plugin::ConfigLoader) ++BuildRequires: perl(Catalyst::Plugin::Static::Simple) ++BuildRequires: perl(Catalyst::Plugin::I18N) ++BuildRequires: perl(Catalyst::Plugin::Unicode::Encoding) ++BuildRequires: perl(Catalyst::Plugin::Authentication) ++BuildRequires: perl(Catalyst::Plugin::Authentication::Store::LDAP) ++BuildRequires: perl(Catalyst::Plugin::Authorization::Roles) ++BuildRequires: perl(Catalyst::Plugin::Captcha) ++BuildRequires: perl(Catalyst::Plugin::Session::Store::File) ++BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie) ++BuildRequires: perl(Catalyst::Action::RenderView) ++BuildRequires: perl(Catalyst::View::TT) ++BuildRequires: perl(Catalyst::View::Email) ++BuildRequires: perl(Catalyst::Model::LDAP::FromAuthentication) ++BuildRequires: perl(Crypt::CBC) ++BuildRequires: perl(Email::Valid) ++BuildRequires: perl(Data::UUID) ++BuildRequires: perl(Config::General) ++BuildArch: noarch ++BuildRoot: %{_tmppath}/%{name}-%{version} ++ ++%description ++CatDap is a combination of system-administrator and end-user web ++interface, designed to handle LDAP based setups. ++It fetches the schema to handle any kind of case, but is made to work ++with groups to give various access. ++ ++%prep ++%setup -q -n %{upstream_name}-%{upstream_version} ++ ++%build ++%{__perl} Makefile.PL INSTALLDIRS=vendor ++%make ++ ++%check ++#make test ++ ++%install ++rm -rf %buildroot ++%makeinstall_std ++ ++%clean ++rm -rf %buildroot ++ ++%files ++%defattr(-,root,root) ++%doc Changes ++%doc README ++%doc catdap.yml ++%{_mandir}/man1/* ++%{_mandir}/man3/* ++%{perl_vendorlib}/CatDap.pm ++%{perl_vendorlib}/CatDap ++%{_bindir}/catdap_*.pl + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/d8eafeac/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/d8eafeac/attachment.html new file mode 100644 index 000000000..011f42469 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/d8eafeac/attachment.html @@ -0,0 +1,136 @@ +<!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>[248] commit spec file from Maarten Vanraes</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>248</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-08 00:15:42 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>commit spec file from Maarten Vanraes</pre> + +<h3>Added Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkCatDapspec">identity/CatDap/trunk/CatDap.spec</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunkCatDapspec">Added: identity/CatDap/trunk/CatDap.spec</a> +=================================================================== +--- identity/CatDap/trunk/CatDap.spec (rev 0) ++++ identity/CatDap/trunk/CatDap.spec 2011-01-07 23:15:42 UTC (rev 248) +@@ -0,0 +1,67 @@ ++%define upstream_name CatDap ++%define upstream_version 0.0.1-r200 ++ ++Name: perl-%{upstream_name} ++Version: %perl_convert_version %{upstream_version} ++Release: %mkrel 1 ++Summary: Web Based LDAP Administration Program ++License: GPL+ or Artistic ++Group: System/Configuration/Other ++Url: http://www.mageia.org/wiki/doku.php?id=web:identity ++Source0: %{upstream_name}-%{upstream_version}.tar.bz2 ++BuildRequires: perl(Module::Install) ++BuildRequires: perl(Module::Install::Catalyst) ++BuildRequires: perl(Catalyst::Plugin::ConfigLoader) ++BuildRequires: perl(Catalyst::Plugin::Static::Simple) ++BuildRequires: perl(Catalyst::Plugin::I18N) ++BuildRequires: perl(Catalyst::Plugin::Unicode::Encoding) ++BuildRequires: perl(Catalyst::Plugin::Authentication) ++BuildRequires: perl(Catalyst::Plugin::Authentication::Store::LDAP) ++BuildRequires: perl(Catalyst::Plugin::Authorization::Roles) ++BuildRequires: perl(Catalyst::Plugin::Captcha) ++BuildRequires: perl(Catalyst::Plugin::Session::Store::File) ++BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie) ++BuildRequires: perl(Catalyst::Action::RenderView) ++BuildRequires: perl(Catalyst::View::TT) ++BuildRequires: perl(Catalyst::View::Email) ++BuildRequires: perl(Catalyst::Model::LDAP::FromAuthentication) ++BuildRequires: perl(Crypt::CBC) ++BuildRequires: perl(Email::Valid) ++BuildRequires: perl(Data::UUID) ++BuildRequires: perl(Config::General) ++BuildArch: noarch ++BuildRoot: %{_tmppath}/%{name}-%{version} ++ ++%description ++CatDap is a combination of system-administrator and end-user web ++interface, designed to handle LDAP based setups. ++It fetches the schema to handle any kind of case, but is made to work ++with groups to give various access. ++ ++%prep ++%setup -q -n %{upstream_name}-%{upstream_version} ++ ++%build ++%{__perl} Makefile.PL INSTALLDIRS=vendor ++%make ++ ++%check ++#make test ++ ++%install ++rm -rf %buildroot ++%makeinstall_std ++ ++%clean ++rm -rf %buildroot ++ ++%files ++%defattr(-,root,root) ++%doc Changes ++%doc README ++%doc catdap.yml ++%{_mandir}/man1/* ++%{_mandir}/man3/* ++%{perl_vendorlib}/CatDap.pm ++%{perl_vendorlib}/CatDap ++%{_bindir}/catdap_*.pl + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/e0495959/attachment-0001.asc b/zarb-ml/mageia-sysadm/attachments/20110108/e0495959/attachment-0001.asc new file mode 100644 index 000000000..24fb316f9 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/e0495959/attachment-0001.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAk0oZJYACgkQk29cDOWzfVDhJgCgkdCtO2HH4cZMPr5Mm1t/fI7t +cLQAoJZYJGpdQkMaHkR3dYrw4n7ozqls +=xBWF +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/e0495959/attachment.asc b/zarb-ml/mageia-sysadm/attachments/20110108/e0495959/attachment.asc new file mode 100644 index 000000000..24fb316f9 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/e0495959/attachment.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEARECAAYFAk0oZJYACgkQk29cDOWzfVDhJgCgkdCtO2HH4cZMPr5Mm1t/fI7t +cLQAoJZYJGpdQkMaHkR3dYrw4n7ozqls +=xBWF +-----END PGP SIGNATURE----- diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/e0732ad0/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/e0732ad0/attachment-0001.html new file mode 100644 index 000000000..45439faae --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/e0732ad0/attachment-0001.html @@ -0,0 +1,100 @@ +<!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>[720] run genhdlist2 as post, not gendistrib</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>720</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 09:51:02 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>run genhdlist2 as post, not gendistrib</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatessubmituploadconf">Modified: puppet/modules/buildsystem/templates/submit-upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-07 22:22:03 UTC (rev 719) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 08:51:02 UTC (rev 720) +@@ -37,7 +37,8 @@ + # - mail + # - archive + - clean +- - gendistrib ++ posts: ++ - genhdlist2 + + 1: + checks: +@@ -55,7 +56,8 @@ + # - mail + # - archive + - clean +- - gendistrib ++ posts: ++ - genhdlist2 + + # checks definition + checks: +@@ -164,7 +166,9 @@ + clean: + class: Youri::Upload::Action::Clean + +- gendistrib: +- class: Youri::Submit::Post::Gendistrib ++ genhdlist2: ++ class: Youri::Submit::Post::Genhdlist2 ++ options: ++ command: /usr/bin/genhdlist2 + + # vim:ft=yaml:et:sw=4 + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/e0732ad0/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/e0732ad0/attachment.html new file mode 100644 index 000000000..45439faae --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/e0732ad0/attachment.html @@ -0,0 +1,100 @@ +<!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>[720] run genhdlist2 as post, not gendistrib</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>720</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 09:51:02 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>run genhdlist2 as post, not gendistrib</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatessubmituploadconf">puppet/modules/buildsystem/templates/submit-upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatessubmituploadconf">Modified: puppet/modules/buildsystem/templates/submit-upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-07 22:22:03 UTC (rev 719) ++++ puppet/modules/buildsystem/templates/submit-upload.conf 2011-01-08 08:51:02 UTC (rev 720) +@@ -37,7 +37,8 @@ + # - mail + # - archive + - clean +- - gendistrib ++ posts: ++ - genhdlist2 + + 1: + checks: +@@ -55,7 +56,8 @@ + # - mail + # - archive + - clean +- - gendistrib ++ posts: ++ - genhdlist2 + + # checks definition + checks: +@@ -164,7 +166,9 @@ + clean: + class: Youri::Upload::Action::Clean + +- gendistrib: +- class: Youri::Submit::Post::Gendistrib ++ genhdlist2: ++ class: Youri::Submit::Post::Genhdlist2 ++ options: ++ command: /usr/bin/genhdlist2 + + # vim:ft=yaml:et:sw=4 + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/e1ec9895/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/e1ec9895/attachment-0001.html new file mode 100644 index 000000000..c60d2ec29 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/e1ec9895/attachment-0001.html @@ -0,0 +1,83 @@ +<!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>[728] do not send commits from schedbot on packages and binrepos to cia.vc</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>728</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-08 15:43:55 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>do not send commits from schedbot on packages and binrepos to cia.vc</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- puppet/manifests/nodes.pp 2011-01-08 14:40:17 UTC (rev 727) ++++ puppet/manifests/nodes.pp 2011-01-08 14:43:55 UTC (rev 728) +@@ -40,12 +40,14 @@ + no_binary => true, + cia_post => true, + cia_module => "packages", ++ cia_ignore_author => '^schedbot$', + } + + subversion::repository { "/svn/binrepos/cauldron/": + group => "mga-packagers", + cia_post => true, + cia_module => "binrepos", ++ cia_ignore_author => '^schedbot$', + } + + subversion::snapshot { "/etc/puppet": + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/e1ec9895/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/e1ec9895/attachment.html new file mode 100644 index 000000000..c60d2ec29 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/e1ec9895/attachment.html @@ -0,0 +1,83 @@ +<!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>[728] do not send commits from schedbot on packages and binrepos to cia.vc</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>728</dd> +<dt>Author</dt> <dd>boklm</dd> +<dt>Date</dt> <dd>2011-01-08 15:43:55 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>do not send commits from schedbot on packages and binrepos to cia.vc</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmanifestsnodespp">puppet/manifests/nodes.pp</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmanifestsnodespp">Modified: puppet/manifests/nodes.pp</a> +=================================================================== +--- puppet/manifests/nodes.pp 2011-01-08 14:40:17 UTC (rev 727) ++++ puppet/manifests/nodes.pp 2011-01-08 14:43:55 UTC (rev 728) +@@ -40,12 +40,14 @@ + no_binary => true, + cia_post => true, + cia_module => "packages", ++ cia_ignore_author => '^schedbot$', + } + + subversion::repository { "/svn/binrepos/cauldron/": + group => "mga-packagers", + cia_post => true, + cia_module => "binrepos", ++ cia_ignore_author => '^schedbot$', + } + + subversion::snapshot { "/etc/puppet": + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/e88683c2/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/e88683c2/attachment-0001.html new file mode 100644 index 000000000..bc029e65b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/e88683c2/attachment-0001.html @@ -0,0 +1,82 @@ +<!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>[731] do not hardcode schedbot home dir</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>731</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 23:56:17 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>do not hardcode schedbot home dir</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesvhost_pkgsubmitconf">puppet/modules/buildsystem/templates/vhost_pkgsubmit.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatesvhost_pkgsubmitconf">Modified: puppet/modules/buildsystem/templates/vhost_pkgsubmit.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/vhost_pkgsubmit.conf 2011-01-08 21:13:08 UTC (rev 730) ++++ puppet/modules/buildsystem/templates/vhost_pkgsubmit.conf 2011-01-08 22:56:17 UTC (rev 731) +@@ -1,11 +1,11 @@ + <% +-pkgsubmit_root = "/home/schedbot/uploads" ++pkgsubmit_root = sched_home_dir + "/uploads" + %> + + <VirtualHost *:80> + ServerName pkgsubmit.<%= domain %> + DocumentRoot <%= pkgsubmit_root %> +- Alias /uploads /home/schedbot/uploads ++ Alias /uploads <%= sched_home_dir %>/uploads + <Location /> + Allow from all + Options Indexes + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/e88683c2/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/e88683c2/attachment.html new file mode 100644 index 000000000..bc029e65b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/e88683c2/attachment.html @@ -0,0 +1,82 @@ +<!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>[731] do not hardcode schedbot home dir</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>731</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2011-01-08 23:56:17 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>do not hardcode schedbot home dir</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesvhost_pkgsubmitconf">puppet/modules/buildsystem/templates/vhost_pkgsubmit.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemtemplatesvhost_pkgsubmitconf">Modified: puppet/modules/buildsystem/templates/vhost_pkgsubmit.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/vhost_pkgsubmit.conf 2011-01-08 21:13:08 UTC (rev 730) ++++ puppet/modules/buildsystem/templates/vhost_pkgsubmit.conf 2011-01-08 22:56:17 UTC (rev 731) +@@ -1,11 +1,11 @@ + <% +-pkgsubmit_root = "/home/schedbot/uploads" ++pkgsubmit_root = sched_home_dir + "/uploads" + %> + + <VirtualHost *:80> + ServerName pkgsubmit.<%= domain %> + DocumentRoot <%= pkgsubmit_root %> +- Alias /uploads /home/schedbot/uploads ++ Alias /uploads <%= sched_home_dir %>/uploads + <Location /> + Allow from all + Options Indexes + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/f0712891/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110108/f0712891/attachment-0001.html new file mode 100644 index 000000000..b791b8421 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/f0712891/attachment-0001.html @@ -0,0 +1,478 @@ +<!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>[249] commit implement forgot_password patch from Maarten Vanraes</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>249</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-08 00:20:14 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>commit implement forgot_password patch from Maarten Vanraes</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkcatdapyml">identity/CatDap/trunk/catdap.yml</a></li> +<li><a href="#identityCatDaptrunkrootindextt">identity/CatDap/trunk/root/index.tt</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#identityCatDaptrunklibCatDapControllerforgot_passwordpm">identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm</a></li> +<li><a href="#identityCatDaptrunkrootemailforgot_passwordtt">identity/CatDap/trunk/root/email/forgot_password.tt</a></li> +<li>identity/CatDap/trunk/root/forgot_password/</li> +<li><a href="#identityCatDaptrunkrootforgot_passwordchecktt">identity/CatDap/trunk/root/forgot_password/check.tt</a></li> +<li><a href="#identityCatDaptrunkrootforgot_passwordcompletett">identity/CatDap/trunk/root/forgot_password/complete.tt</a></li> +<li><a href="#identityCatDaptrunkrootforgot_passwordconfirmtt">identity/CatDap/trunk/root/forgot_password/confirm.tt</a></li> +<li><a href="#identityCatDaptrunkrootforgot_passwordindextt">identity/CatDap/trunk/root/forgot_password/index.tt</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunkcatdapyml">Modified: identity/CatDap/trunk/catdap.yml</a> +=================================================================== +--- identity/CatDap/trunk/catdap.yml 2011-01-07 23:15:42 UTC (rev 248) ++++ identity/CatDap/trunk/catdap.yml 2011-01-07 23:20:14 UTC (rev 249) +@@ -35,6 +35,12 @@ + login_blacklist: + - apache + ++forgot_password: ++ secret: ++ path: '/tmp/' ++ prefix: 'catdap-forgot_password-' ++ timeout: 259200 ++ + authentication: + default_realm: ldap + realms: +@@ -55,6 +61,7 @@ + user_filter: '(&(objectClass=inetOrgPerson)(uid=%s))' + user_scope: 'one' + user_field: 'uid' ++ email_filter: '(&(objectClass=inetOrgPerson)(|(mail=%s)(mailAlternateAddress=%s)))' + use_roles: 1 + role_basedn: 'dc=mageia,dc=org' + role_scope: 'sub' + +<a id="identityCatDaptrunklibCatDapControllerforgot_passwordpm">Added: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm</a> +=================================================================== +--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm (rev 0) ++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,270 @@ ++package CatDap::Controller::forgot_password; ++use Moose; ++use namespace::autoclean; ++use Email::Valid; ++use Data::UUID; ++ ++BEGIN {extends 'Catalyst::Controller'; } ++ ++=head1 NAME ++ ++CatDap::Controller::forgot_password - Catalyst Controller ++ ++=head1 DESCRIPTION ++ ++Catalyst Controller. ++ ++=head1 METHODS ++ ++=cut ++ ++ ++=head2 index ++ ++=cut ++ ++sub index :Path :Args(0) : Form { ++ my ( $self, $c ) = @_; ++ ++ if (defined $c->user) { ++ # if we're logged in, we haven't forgotten the password ++ $c->log->debug('Redirecting to /user'); ++ $c->res->redirect('/user'); ++ } ++} ++ ++sub check : Local { ++ my ( $self, $c ) = @_; ++ ++ my %details = %{$c->request->params}; ++ my $username = lc($c->request->params->{uid}); ++ my @errors; ++ $c->stash(errors => []); ++ my $email = $c->request->params->{mail}; ++ if (! Email::Valid->address($email)) { ++ push @errors, $c->loc('Invalid email address'); ++ } ++ ++ if (@errors) { ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ ++ # check in LDAP now that we have validated username and email ++ my $emailfilter = $c->config->{'authentication'}{'realms'}{'ldap'}{'store'}{'email_filter'}; ++ $emailfilter =~ s/\%s/$email/g, ++ $c->log->debug("Searching for email $email with filter $emailfilter"); ++ my $mesg = $c->model('Proxy')->search($emailfilter); ++ if (!$mesg->entries()) { ++ push @errors,$c->loc( ++ 'This email address is not bound to an account' ++ ); ++ } ++ ++ if (@errors) { ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ ++ if ($mesg->code) { ++ push @errors,$mesg->error; ++ $c->log->info( sprintf("finding email $email failed: %s", $mesg->error) ); ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'register/index.tt'); ++ return; ++ } ++ ++ my $secret = gen_secret($c, $email); ++ ++ $c->stash( ++ email => { ++ 'to' => $email, ++ 'from' => ${$c->config}{'emailfrom'}, ++ 'subject' => ${$c->config}{'apptitle'} . " - " . $c->loc('Forgot password'), ++ 'template' => 'forgot_password.tt', ++ }, ++ url => $c->uri_for('/forgot_password/confirm') . "?secret=$secret", ++ ); ++ ++ $c->log->info("Sending forgot password mail to email address $email"); ++ $c->forward( $c->view('Email::Template') ); ++ if ( @{ $c->error } ) { ++ my $errors = join "\n",@{ $c->error }; ++ $c->log->info("Sending activation mail to $email failed: $errors"); ++ $c->response->body($c->loc('An error occured sending the email, please try again later. Errors [_1]', $errors)); ++ $c->error(0); # Reset the error condition if you need to ++ } ++ $c->stash(template => 'forgot_password/complete.tt'); ++} ++ ++sub confirm : Local { ++ my ($self, $c) = @_; ++ my $secret = $c->req->param('secret'); ++ my @errors; ++ ++ # show confirm page which can enter new password ++ if (defined $c->user) { ++ # if we're logged in, we haven't forgotten the password ++ $c->log->debug('Redirecting to /user'); ++ $c->res->redirect('/user'); ++ } ++ ++ # find secret ++ my $email = find_secret($c, $secret); ++ if (!$email) { ++ push @errors, "Secret has expired, please try again."; ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ my $mesg = find_user_email($c, $email); ++ if ($mesg->code) { ++ push @errors, "Secret has expired, please try again."; ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ ++ # show template to enter a new password ++ $c->stash(secret => $secret, template => 'forgot_password/confirm.tt'); ++} ++ ++sub change_password : Local { ++ my ($self, $c) = @_; ++ my @errors = (); ++ my $secret = $c->req->param('secret'); ++ my $newpass; ++ ++ # find secret ++ my $email = find_secret($c, $secret); ++ if (!$email) { ++ push @errors, "Secret has expired, please try again."; ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ my $mesg = find_user_email($c, $email); ++ if ( $mesg->code) { ++ push @errors, "Secret has expired, please try again."; ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ my $entry = $mesg->entry; ++ ++ # check if both passwords are equal and are confirm the validation norms ++ if ($c->req->param('newpassword1') eq $c->req->param('newpassword2')) { ++ $newpass = $c->req->param('newpassword1'); ++ } else { ++ push @errors, "New passwords dont match"; ++ } ++ # if error show confirm page again to retry ++ if (@errors) { ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/confirm.tt'); ++ return; ++ } ++ ++ # change password ++ my $pp = Net::LDAP::Control::PasswordPolicy->new; ++ $mesg = $c->model('Proxy')->set_password( ++ user => $entry->dn, ++ newpasswd => $newpass, ++ control => [ $pp ], ++ ); ++ if ($mesg->code) { ++ my $perror = $mesg->error; ++ push @errors, "Password change failed: $perror"; ++ $c->detach; ++ } ++ ++ # if error show confirm page again to retry ++ if (@errors) { ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/confirm.tt'); ++ return; ++ } ++ ++ # TODO: log in by setting the $c->user ++ ++ # remove the stored secret ++ remove_secret($c, $secret); ++ ++ # redirect to / ++ $c->log->debug('Redirecting to /'); ++ $c->res->redirect('/'); ++} ++ ++sub gen_secret { ++ my ($c, $email) = @_; ++ my $ug = new Data::UUID; ++ # generate a unique secret ++ my $secret = $ug->create_str(); ++ my $filename = $c->config->{'forgot_password'}{'secret'}{'path'} .'/'. $c->config->{'forgot_password'}{'secret'}{'prefix'} . $secret; ++ # store secret with email ++ open FILE, ">$filename"; ++ print FILE $email; ++ close FILE; ++ return $secret; ++} ++ ++sub find_secret { ++ my ($c, $secret) = @_; ++ my $email; ++ my $filename = $c->config->{'forgot_password'}{'secret'}{'path'} .'/'. $c->config->{'forgot_password'}{'secret'}{'prefix'} . $secret; ++ my $timeout = 259200; # 3days in seconds ++ if ($c->config->{'forgot_password'}{'secret'}{'timeout'}) { ++ $timeout = $c->config->{'forgot_password'}{'secret'}{'timeout'}; ++ } ++ ++ # find secret ++ if (!$secret || !open(FILE, "<$filename")) { ++ # if secret is wrong, timeout expired? ++ return ''; ++ } ++ read(FILE, $email, 255); ++ close FILE; ++ ++ # check the time, and see if it's longer than timeout ++ my @s = stat($filename); ++ if (time() > $s[9] + $timeout) { ++ # expired ++ return ''; ++ } ++ ++ return $email; ++} ++ ++sub remove_secret { ++ my ($c, $secret) = @_; ++ my $filename = $c->config->{'forgot_password'}{'secret'}{'path'} .'/'. $c->config->{'forgot_password'}{'secret'}{'prefix'} . $secret; ++ unlink $filename; ++} ++ ++sub find_user_email { ++ my ($c, $email) = @_; ++ ++ # find user by email; ++ my $emailfilter = $c->config->{'authentication'}{'realms'}{'ldap'}{'store'}{'email_filter'}; ++ $emailfilter =~ s/\%s/$email/g, ++ $c->log->debug("Searching for email $email with filter $emailfilter"); ++ return $c->model('Proxy')->search($emailfilter); ++} ++ ++ ++=head1 AUTHOR ++ ++Buchan Milne ++ ++=head1 LICENSE ++ ++This library is free software. You can redistribute it and/or modify ++it under the same terms as Perl itself. ++ ++=cut ++ ++__PACKAGE__->meta->make_immutable; ++ ++1; + +<a id="identityCatDaptrunkrootemailforgot_passwordtt">Added: identity/CatDap/trunk/root/email/forgot_password.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/email/forgot_password.tt (rev 0) ++++ identity/CatDap/trunk/root/email/forgot_password.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,7 @@ ++[% l('Dear [_1],',cn) %] ++[% l('Your [_1] account has been requested to change the password. If you did not do this, or you do not want to change your password; you can just do nothing.',c.config.organisation) %] ++[% l('To reset your password, please follow the link below.') %] ++[% url %] ++ ++-- ++http://mageia.org/ + +<a id="identityCatDaptrunkrootforgot_passwordchecktt">Added: identity/CatDap/trunk/root/forgot_password/check.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/forgot_password/check.tt (rev 0) ++++ identity/CatDap/trunk/root/forgot_password/check.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,4 @@ ++<h2>Success</h2> ++<p> ++[% message %] ++</p> +\ No newline at end of file + +<a id="identityCatDaptrunkrootforgot_passwordcompletett">Added: identity/CatDap/trunk/root/forgot_password/complete.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/forgot_password/complete.tt (rev 0) ++++ identity/CatDap/trunk/root/forgot_password/complete.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,6 @@ ++<h2>[% l('Email sent.') %]</h2> ++ ++<p> ++ [% l('Operation was successful.') %] ++ [% l('Check your mail for password reset instructions.') %] ++</p> + +<a id="identityCatDaptrunkrootforgot_passwordconfirmtt">Added: identity/CatDap/trunk/root/forgot_password/confirm.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/forgot_password/confirm.tt (rev 0) ++++ identity/CatDap/trunk/root/forgot_password/confirm.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,21 @@ ++ ++<h1>[% l('Enter new password.') %]</h1> ++ ++<div id="input_form"> ++<form method="post" action="/forgot_password/change_password"> ++ <table> ++ <tr> ++ <td><label for="newpassword1_">[% l('New Password') %]</label></td> ++ <td><input id="newpassword1_" name="newpassword1" type="password" value="" /></td> ++ </tr><tr> ++ <td><label for="newpassword2_">[% l('Repeat New Password') %]</label></td> ++ <td><input id="newpassword2_" name="newpassword2" type="password" value="" /></td> ++ </tr><tr> ++ <td colspan="2" style="text-align:center;"> ++ <input type="hidden" name="secret" value="[% secret %]" /> ++ <button type="submit" value="[% l('Set new password') %]">[% l('Set new password') %]</button> ++ </td> ++ </tr> ++ </table> ++</form> ++</div> + +<a id="identityCatDaptrunkrootforgot_passwordindextt">Added: identity/CatDap/trunk/root/forgot_password/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/forgot_password/index.tt (rev 0) ++++ identity/CatDap/trunk/root/forgot_password/index.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,17 @@ ++ ++<h1>[% l('Forgot your password?') %]</h1> ++ ++<div id="input_form"> ++<form method="post" action="/forgot_password/check"> ++ <table> ++ <tr> ++ <td><label for="mail_">[% l('Email address') %]</label></td> ++ <td><input id="mail_" type="text" name="mail" value="[% c.request.params.mail %]" /></td> ++ </tr><tr> ++ <td colspan="2" style="text-align:center;"> ++ <button type="submit" value="[% l('Reset password') %]">[% l('Reset password') %]</button> ++ </td> ++ </tr> ++ </table> ++</form> ++</div> + +<a id="identityCatDaptrunkrootindextt">Modified: identity/CatDap/trunk/root/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/index.tt 2011-01-07 23:15:42 UTC (rev 248) ++++ identity/CatDap/trunk/root/index.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -14,8 +14,7 @@ + </div> + <div id="login_form_line"> + <span><a href="/register">[% l('Register') %]</a> | +- @todo [% l('Forgotten password?') %] +- <!--<a href="/forgot_password">[% l('Forgotten password?') %]</a> --> ++ <a href="/forgot_password">[% l('Forgotten password?') %]</a> + </span> + </div> + </form> + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110108/f0712891/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110108/f0712891/attachment.html new file mode 100644 index 000000000..b791b8421 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110108/f0712891/attachment.html @@ -0,0 +1,478 @@ +<!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>[249] commit implement forgot_password patch from Maarten Vanraes</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>249</dd> +<dt>Author</dt> <dd>rda</dd> +<dt>Date</dt> <dd>2011-01-08 00:20:14 +0100 (Sat, 08 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>commit implement forgot_password patch from Maarten Vanraes</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#identityCatDaptrunkcatdapyml">identity/CatDap/trunk/catdap.yml</a></li> +<li><a href="#identityCatDaptrunkrootindextt">identity/CatDap/trunk/root/index.tt</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#identityCatDaptrunklibCatDapControllerforgot_passwordpm">identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm</a></li> +<li><a href="#identityCatDaptrunkrootemailforgot_passwordtt">identity/CatDap/trunk/root/email/forgot_password.tt</a></li> +<li>identity/CatDap/trunk/root/forgot_password/</li> +<li><a href="#identityCatDaptrunkrootforgot_passwordchecktt">identity/CatDap/trunk/root/forgot_password/check.tt</a></li> +<li><a href="#identityCatDaptrunkrootforgot_passwordcompletett">identity/CatDap/trunk/root/forgot_password/complete.tt</a></li> +<li><a href="#identityCatDaptrunkrootforgot_passwordconfirmtt">identity/CatDap/trunk/root/forgot_password/confirm.tt</a></li> +<li><a href="#identityCatDaptrunkrootforgot_passwordindextt">identity/CatDap/trunk/root/forgot_password/index.tt</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="identityCatDaptrunkcatdapyml">Modified: identity/CatDap/trunk/catdap.yml</a> +=================================================================== +--- identity/CatDap/trunk/catdap.yml 2011-01-07 23:15:42 UTC (rev 248) ++++ identity/CatDap/trunk/catdap.yml 2011-01-07 23:20:14 UTC (rev 249) +@@ -35,6 +35,12 @@ + login_blacklist: + - apache + ++forgot_password: ++ secret: ++ path: '/tmp/' ++ prefix: 'catdap-forgot_password-' ++ timeout: 259200 ++ + authentication: + default_realm: ldap + realms: +@@ -55,6 +61,7 @@ + user_filter: '(&(objectClass=inetOrgPerson)(uid=%s))' + user_scope: 'one' + user_field: 'uid' ++ email_filter: '(&(objectClass=inetOrgPerson)(|(mail=%s)(mailAlternateAddress=%s)))' + use_roles: 1 + role_basedn: 'dc=mageia,dc=org' + role_scope: 'sub' + +<a id="identityCatDaptrunklibCatDapControllerforgot_passwordpm">Added: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm</a> +=================================================================== +--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm (rev 0) ++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,270 @@ ++package CatDap::Controller::forgot_password; ++use Moose; ++use namespace::autoclean; ++use Email::Valid; ++use Data::UUID; ++ ++BEGIN {extends 'Catalyst::Controller'; } ++ ++=head1 NAME ++ ++CatDap::Controller::forgot_password - Catalyst Controller ++ ++=head1 DESCRIPTION ++ ++Catalyst Controller. ++ ++=head1 METHODS ++ ++=cut ++ ++ ++=head2 index ++ ++=cut ++ ++sub index :Path :Args(0) : Form { ++ my ( $self, $c ) = @_; ++ ++ if (defined $c->user) { ++ # if we're logged in, we haven't forgotten the password ++ $c->log->debug('Redirecting to /user'); ++ $c->res->redirect('/user'); ++ } ++} ++ ++sub check : Local { ++ my ( $self, $c ) = @_; ++ ++ my %details = %{$c->request->params}; ++ my $username = lc($c->request->params->{uid}); ++ my @errors; ++ $c->stash(errors => []); ++ my $email = $c->request->params->{mail}; ++ if (! Email::Valid->address($email)) { ++ push @errors, $c->loc('Invalid email address'); ++ } ++ ++ if (@errors) { ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ ++ # check in LDAP now that we have validated username and email ++ my $emailfilter = $c->config->{'authentication'}{'realms'}{'ldap'}{'store'}{'email_filter'}; ++ $emailfilter =~ s/\%s/$email/g, ++ $c->log->debug("Searching for email $email with filter $emailfilter"); ++ my $mesg = $c->model('Proxy')->search($emailfilter); ++ if (!$mesg->entries()) { ++ push @errors,$c->loc( ++ 'This email address is not bound to an account' ++ ); ++ } ++ ++ if (@errors) { ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ ++ if ($mesg->code) { ++ push @errors,$mesg->error; ++ $c->log->info( sprintf("finding email $email failed: %s", $mesg->error) ); ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'register/index.tt'); ++ return; ++ } ++ ++ my $secret = gen_secret($c, $email); ++ ++ $c->stash( ++ email => { ++ 'to' => $email, ++ 'from' => ${$c->config}{'emailfrom'}, ++ 'subject' => ${$c->config}{'apptitle'} . " - " . $c->loc('Forgot password'), ++ 'template' => 'forgot_password.tt', ++ }, ++ url => $c->uri_for('/forgot_password/confirm') . "?secret=$secret", ++ ); ++ ++ $c->log->info("Sending forgot password mail to email address $email"); ++ $c->forward( $c->view('Email::Template') ); ++ if ( @{ $c->error } ) { ++ my $errors = join "\n",@{ $c->error }; ++ $c->log->info("Sending activation mail to $email failed: $errors"); ++ $c->response->body($c->loc('An error occured sending the email, please try again later. Errors [_1]', $errors)); ++ $c->error(0); # Reset the error condition if you need to ++ } ++ $c->stash(template => 'forgot_password/complete.tt'); ++} ++ ++sub confirm : Local { ++ my ($self, $c) = @_; ++ my $secret = $c->req->param('secret'); ++ my @errors; ++ ++ # show confirm page which can enter new password ++ if (defined $c->user) { ++ # if we're logged in, we haven't forgotten the password ++ $c->log->debug('Redirecting to /user'); ++ $c->res->redirect('/user'); ++ } ++ ++ # find secret ++ my $email = find_secret($c, $secret); ++ if (!$email) { ++ push @errors, "Secret has expired, please try again."; ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ my $mesg = find_user_email($c, $email); ++ if ($mesg->code) { ++ push @errors, "Secret has expired, please try again."; ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ ++ # show template to enter a new password ++ $c->stash(secret => $secret, template => 'forgot_password/confirm.tt'); ++} ++ ++sub change_password : Local { ++ my ($self, $c) = @_; ++ my @errors = (); ++ my $secret = $c->req->param('secret'); ++ my $newpass; ++ ++ # find secret ++ my $email = find_secret($c, $secret); ++ if (!$email) { ++ push @errors, "Secret has expired, please try again."; ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ my $mesg = find_user_email($c, $email); ++ if ( $mesg->code) { ++ push @errors, "Secret has expired, please try again."; ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/index.tt'); ++ return; ++ } ++ my $entry = $mesg->entry; ++ ++ # check if both passwords are equal and are confirm the validation norms ++ if ($c->req->param('newpassword1') eq $c->req->param('newpassword2')) { ++ $newpass = $c->req->param('newpassword1'); ++ } else { ++ push @errors, "New passwords dont match"; ++ } ++ # if error show confirm page again to retry ++ if (@errors) { ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/confirm.tt'); ++ return; ++ } ++ ++ # change password ++ my $pp = Net::LDAP::Control::PasswordPolicy->new; ++ $mesg = $c->model('Proxy')->set_password( ++ user => $entry->dn, ++ newpasswd => $newpass, ++ control => [ $pp ], ++ ); ++ if ($mesg->code) { ++ my $perror = $mesg->error; ++ push @errors, "Password change failed: $perror"; ++ $c->detach; ++ } ++ ++ # if error show confirm page again to retry ++ if (@errors) { ++ $c->stash(errors => \@errors); ++ $c->stash(template => 'forgot_password/confirm.tt'); ++ return; ++ } ++ ++ # TODO: log in by setting the $c->user ++ ++ # remove the stored secret ++ remove_secret($c, $secret); ++ ++ # redirect to / ++ $c->log->debug('Redirecting to /'); ++ $c->res->redirect('/'); ++} ++ ++sub gen_secret { ++ my ($c, $email) = @_; ++ my $ug = new Data::UUID; ++ # generate a unique secret ++ my $secret = $ug->create_str(); ++ my $filename = $c->config->{'forgot_password'}{'secret'}{'path'} .'/'. $c->config->{'forgot_password'}{'secret'}{'prefix'} . $secret; ++ # store secret with email ++ open FILE, ">$filename"; ++ print FILE $email; ++ close FILE; ++ return $secret; ++} ++ ++sub find_secret { ++ my ($c, $secret) = @_; ++ my $email; ++ my $filename = $c->config->{'forgot_password'}{'secret'}{'path'} .'/'. $c->config->{'forgot_password'}{'secret'}{'prefix'} . $secret; ++ my $timeout = 259200; # 3days in seconds ++ if ($c->config->{'forgot_password'}{'secret'}{'timeout'}) { ++ $timeout = $c->config->{'forgot_password'}{'secret'}{'timeout'}; ++ } ++ ++ # find secret ++ if (!$secret || !open(FILE, "<$filename")) { ++ # if secret is wrong, timeout expired? ++ return ''; ++ } ++ read(FILE, $email, 255); ++ close FILE; ++ ++ # check the time, and see if it's longer than timeout ++ my @s = stat($filename); ++ if (time() > $s[9] + $timeout) { ++ # expired ++ return ''; ++ } ++ ++ return $email; ++} ++ ++sub remove_secret { ++ my ($c, $secret) = @_; ++ my $filename = $c->config->{'forgot_password'}{'secret'}{'path'} .'/'. $c->config->{'forgot_password'}{'secret'}{'prefix'} . $secret; ++ unlink $filename; ++} ++ ++sub find_user_email { ++ my ($c, $email) = @_; ++ ++ # find user by email; ++ my $emailfilter = $c->config->{'authentication'}{'realms'}{'ldap'}{'store'}{'email_filter'}; ++ $emailfilter =~ s/\%s/$email/g, ++ $c->log->debug("Searching for email $email with filter $emailfilter"); ++ return $c->model('Proxy')->search($emailfilter); ++} ++ ++ ++=head1 AUTHOR ++ ++Buchan Milne ++ ++=head1 LICENSE ++ ++This library is free software. You can redistribute it and/or modify ++it under the same terms as Perl itself. ++ ++=cut ++ ++__PACKAGE__->meta->make_immutable; ++ ++1; + +<a id="identityCatDaptrunkrootemailforgot_passwordtt">Added: identity/CatDap/trunk/root/email/forgot_password.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/email/forgot_password.tt (rev 0) ++++ identity/CatDap/trunk/root/email/forgot_password.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,7 @@ ++[% l('Dear [_1],',cn) %] ++[% l('Your [_1] account has been requested to change the password. If you did not do this, or you do not want to change your password; you can just do nothing.',c.config.organisation) %] ++[% l('To reset your password, please follow the link below.') %] ++[% url %] ++ ++-- ++http://mageia.org/ + +<a id="identityCatDaptrunkrootforgot_passwordchecktt">Added: identity/CatDap/trunk/root/forgot_password/check.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/forgot_password/check.tt (rev 0) ++++ identity/CatDap/trunk/root/forgot_password/check.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,4 @@ ++<h2>Success</h2> ++<p> ++[% message %] ++</p> +\ No newline at end of file + +<a id="identityCatDaptrunkrootforgot_passwordcompletett">Added: identity/CatDap/trunk/root/forgot_password/complete.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/forgot_password/complete.tt (rev 0) ++++ identity/CatDap/trunk/root/forgot_password/complete.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,6 @@ ++<h2>[% l('Email sent.') %]</h2> ++ ++<p> ++ [% l('Operation was successful.') %] ++ [% l('Check your mail for password reset instructions.') %] ++</p> + +<a id="identityCatDaptrunkrootforgot_passwordconfirmtt">Added: identity/CatDap/trunk/root/forgot_password/confirm.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/forgot_password/confirm.tt (rev 0) ++++ identity/CatDap/trunk/root/forgot_password/confirm.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,21 @@ ++ ++<h1>[% l('Enter new password.') %]</h1> ++ ++<div id="input_form"> ++<form method="post" action="/forgot_password/change_password"> ++ <table> ++ <tr> ++ <td><label for="newpassword1_">[% l('New Password') %]</label></td> ++ <td><input id="newpassword1_" name="newpassword1" type="password" value="" /></td> ++ </tr><tr> ++ <td><label for="newpassword2_">[% l('Repeat New Password') %]</label></td> ++ <td><input id="newpassword2_" name="newpassword2" type="password" value="" /></td> ++ </tr><tr> ++ <td colspan="2" style="text-align:center;"> ++ <input type="hidden" name="secret" value="[% secret %]" /> ++ <button type="submit" value="[% l('Set new password') %]">[% l('Set new password') %]</button> ++ </td> ++ </tr> ++ </table> ++</form> ++</div> + +<a id="identityCatDaptrunkrootforgot_passwordindextt">Added: identity/CatDap/trunk/root/forgot_password/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/forgot_password/index.tt (rev 0) ++++ identity/CatDap/trunk/root/forgot_password/index.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -0,0 +1,17 @@ ++ ++<h1>[% l('Forgot your password?') %]</h1> ++ ++<div id="input_form"> ++<form method="post" action="/forgot_password/check"> ++ <table> ++ <tr> ++ <td><label for="mail_">[% l('Email address') %]</label></td> ++ <td><input id="mail_" type="text" name="mail" value="[% c.request.params.mail %]" /></td> ++ </tr><tr> ++ <td colspan="2" style="text-align:center;"> ++ <button type="submit" value="[% l('Reset password') %]">[% l('Reset password') %]</button> ++ </td> ++ </tr> ++ </table> ++</form> ++</div> + +<a id="identityCatDaptrunkrootindextt">Modified: identity/CatDap/trunk/root/index.tt</a> +=================================================================== +--- identity/CatDap/trunk/root/index.tt 2011-01-07 23:15:42 UTC (rev 248) ++++ identity/CatDap/trunk/root/index.tt 2011-01-07 23:20:14 UTC (rev 249) +@@ -14,8 +14,7 @@ + </div> + <div id="login_form_line"> + <span><a href="/register">[% l('Register') %]</a> | +- @todo [% l('Forgotten password?') %] +- <!--<a href="/forgot_password">[% l('Forgotten password?') %]</a> --> ++ <a href="/forgot_password">[% l('Forgotten password?') %]</a> + </span> + </div> + </form> + +</pre></div> + +</body> +</html>
\ No newline at end of file |