<!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>[500] add repsys conf file (listing cauldron)</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>500</dd> <dt>Author</dt> <dd>blino</dd> <dt>Date</dt> <dd>2010-12-05 21:59:00 +0100 (Sun, 05 Dec 2010)</dd> </dl> <h3>Log Message</h3> <pre>add repsys conf file (listing cauldron)</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="#puppetmodulesbuildsystemtemplatesrepsysconf">puppet/modules/buildsystem/templates/repsys.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-12-05 20:28:13 UTC (rev 499) +++ puppet/modules/buildsystem/manifests/init.pp 2010-12-05 20:59:00 UTC (rev 500) @@ -37,6 +37,7 @@ include scheduler include gatherer + include repsys } class buildnode inherits base { @@ -69,7 +70,13 @@ } - + file { "repsys.conf": + path => "/etc/repsys.conf", + owner => root, + group => root, + mode => 644, + content => template("buildsystem/repsys.conf") + } } define sshuser($homedir, $comment) { <a id="puppetmodulesbuildsystemtemplatesrepsysconf">Added: puppet/modules/buildsystem/templates/repsys.conf</a> =================================================================== --- puppet/modules/buildsystem/templates/repsys.conf (rev 0) +++ puppet/modules/buildsystem/templates/repsys.conf 2010-12-05 20:59:00 UTC (rev 500) @@ -0,0 +1,59 @@ +[global] +verbose = no +default_parent = svn+ssh://svn.<%= domain %>/svn/packages/cauldron +#url-map = svn\+ssh://svn\.mageia\.org/(.*) file:///\1 +tempdir = /home/schedbot/repsys/tmp +# ldap settings +# ldap is searched first: if not found, then [users] is read +# if ldap search matched, then [users] is not consulted +# if ldap is down, [users] is not consulted either +# +# we should have a generic fqdn here to use round-robin DNS +# enhancement for repsys: support multiple ldap servers here +ldap-server = ldap.<%= domain %> +ldap-base = ou=People,<%= dc_suffix %> +ldap-filterformat = (&(objectClass=inetOrgPerson)(uid=$username)) +ldap-resultformat = $cn <$mail> + +[log] +oldurl = svn+ssh://svn.<%= domain %>/svn/packages/misc +# controls up to which revision the rpm changelog +# will be constructed (default zero, i.e., oldest +# commit) +# revision-offset = 0 +# commit lines containing this string won't be shown in the changelog: +ignore-string = SILENT + +[template] +path = /usr/share/repsys/default.chlog + +[users] +iurt = Mageia build bot <mageia-sysadm@<%= domain %>> + +[submit] +default = cauldron +host = pkgsubmit.<%= domain %> + +[submit cauldron] +target = /home/schedbot/repsys/srpms +allowed = svn+ssh://svn.<%= domain %>/svn/packages/cauldron svn+ssh://svn.<%= domain %>/svn/packages/branches/cauldron +rpm-macros = global cauldron + +[macros global] +distsuffix = mga + +[macros cauldron] +distro_release = 1.0 +# 100 * major + minor +mgaversion = 100 +manbo_release = 2 +mageia_branch = cauldron + +[helper] +create-srpm = /usr/share/repsys/create-srpm +upload-srpm = perl -I/usr/share/mdv-youri-core/lib -I/usr/share/mdv-youri-submit/lib /usr/share/mdv-youri-submit/bin/youri-submit +# needed by mdvsys 2.0 +install-buildrequires = sudo rurpmi --auto --no-suggests + +[srpm] +run-prep = yes </pre></div> </body> </html>