diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101123/8b7e8954/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101123/8b7e8954/attachment.html | 171 |
1 files changed, 171 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101123/8b7e8954/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101123/8b7e8954/attachment.html new file mode 100644 index 000000000..3ad32c863 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101123/8b7e8954/attachment.html @@ -0,0 +1,171 @@ +<!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>[430] add iurt upload.conf file for ulri and emi</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>430</dd> +<dt>Author</dt> <dd>blino</dd> +<dt>Date</dt> <dd>2010-11-23 23:24:27 +0100 (Tue, 23 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>add iurt upload.conf file for ulri and emi</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemmanifestsinitpp">puppet/modules/buildsystem/manifests/init.pp</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulesbuildsystemtemplatesuploadconf">puppet/modules/buildsystem/templates/upload.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbuildsystemmanifestsinitpp">Modified: puppet/modules/buildsystem/manifests/init.pp</a> +=================================================================== +--- puppet/modules/buildsystem/manifests/init.pp 2010-11-23 22:08:58 UTC (rev 429) ++++ puppet/modules/buildsystem/manifests/init.pp 2010-11-23 22:24:27 UTC (rev 430) +@@ -31,6 +31,8 @@ + vhost_file => "buildsystem/vhost_repository.conf", + } + ++ include scheduler ++ include dispatcher + } + + class buildnode inherits base { +@@ -39,11 +41,24 @@ + + class scheduler { + # ulri ++ include iurtupload + } + + class dispatcher { + # emi ++ include iurtupload + } ++ ++ class iurtupload { ++ file { "/etc/iurt/update.conf": ++ ensure => present, ++ owner => $build_login, ++ group => $build_login, ++ mode => 644, ++ require => File["/etc/iurt"], ++ content => template("buildsystem/upload.conf") ++ } ++ } + + class repsys { + package { 'repsys': + +<a id="puppetmodulesbuildsystemtemplatesuploadconf">Added: puppet/modules/buildsystem/templates/upload.conf</a> +=================================================================== +--- puppet/modules/buildsystem/templates/upload.conf (rev 0) ++++ puppet/modules/buildsystem/templates/upload.conf 2010-11-23 22:24:27 UTC (rev 430) +@@ -0,0 +1,58 @@ ++### ++# ++# Do not disable the host without appropriate warning ++# to somebody able to fix the machine ++# ++# Please run 'perl -cw .upload.conf' in order to check the file is OK. ++# ++### ++ ++{ ++ bot => { ++ i586 => { ++ map { ++ ($_ => { ++ iurt => { ++ user => 'iurt', ++# (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind ++# command => 'iurt --copy_srpm --group -v 1 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ --additional-media -m __MEDIA__ -- file:///home/iurt_cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__', ++ command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__', ++ packages => '/home/iurt/iurt/', ++ log => '/home/iurt/iurt/', ++ }, ++ }); ++ } qw(ecosse), ++ }, ++ ++ x86_64 => { ++ map { ++ ($_ => { ++ iurt => { ++ user => 'iurt', ++ command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy-srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ --additional-media -m __MEDIA__ -- file:///home/iurt_cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__', ++ packages => '/home/iurt/iurt/', ++ log => '/home/iurt/iurt/', ++ }, ++ }); ++ } qw(jonund), ++ }, ++ }, ++ media => { ++ default => { ++ "main/release" => [ "main/updates", "main/release" ], ++ "main/updates" => [ "main/updates", "main/release" ], ++ "main/testing" => [ "main/testing", "main/updates", "main/release" ], ++ "main/backports" => [ "main/backports", "main/updates", "main/release" ], ++ "contrib/release" => [ "main/updates", "main/release", "contrib/updates", "contrib/release" ], ++ "contrib/updates" => [ "main/updates", "main/release", "contrib/updates", "contrib/release" ], ++ "contrib/testing" => [ "main/updates", "main/release", "main/testing", "contrib/updates", "contrib/release", "contrib/testing" ], ++ "contrib/backports" => [ "main/backports", "main/updates", "main/release", "contrib/backports", "contrib/updates", "contrib/release" ], ++ # (blino) non-free packages may require contrib packages (gcc3.3-g77 for scilab) ++ "non-free/release" => [ "main/updates", "main/release", "contrib/updates", "contrib/release", "non-free/updates", "non-free/release" ], ++ "non-free/updates" => [ "main/updates", "main/release", "contrib/updates", "contrib/release", "non-free/updates", "non-free/release" ], ++ "non-free/testing" => [ "main/updates", "main/release", "main/testing", "contrib/updates", "contrib/release", "contrib/testing", "non-free/updates", "non-free/release", "non-free/testing" ], ++ "non-free/backports" => [ "main/backports", "main/release", "main/updates", "contrib/backports", "contrib/updates", "contrib/release", "non-free/backports", "non-free/updates", "non-free/release" ], ++ }, ++ }, ++ admin => 'mageia-sysadm@mageia.org', ++} + +</pre></div> + +</body> +</html>
\ No newline at end of file |