From 1be510f9529cb082f802408b472a77d074b394c0 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Sun, 14 Apr 2013 13:46:12 +0000 Subject: Add zarb MLs html archives --- .../20101208/12d1355f/attachment-0001.html | 88 +++++++ .../attachments/20101208/12d1355f/attachment.html | 88 +++++++ .../20101208/17fb5de1/attachment-0001.html | 77 ++++++ .../attachments/20101208/17fb5de1/attachment.html | 77 ++++++ .../20101208/4304d221/attachment-0001.html | 76 ++++++ .../attachments/20101208/4304d221/attachment.html | 76 ++++++ .../20101208/5c2fa56c/attachment-0001.html | 77 ++++++ .../attachments/20101208/5c2fa56c/attachment.html | 77 ++++++ .../20101208/a7ac39ec/attachment-0001.html | 133 +++++++++++ .../attachments/20101208/a7ac39ec/attachment.html | 133 +++++++++++ .../20101208/adbe4e24/attachment-0001.html | 95 ++++++++ .../attachments/20101208/adbe4e24/attachment.html | 95 ++++++++ .../20101208/b04328a7/attachment-0001.html | 261 +++++++++++++++++++++ .../attachments/20101208/b04328a7/attachment.html | 261 +++++++++++++++++++++ .../20101208/f7b74d75/attachment-0001.html | 76 ++++++ .../attachments/20101208/f7b74d75/attachment.html | 76 ++++++ 16 files changed, 1766 insertions(+) create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/12d1355f/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/12d1355f/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/17fb5de1/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/17fb5de1/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/4304d221/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/4304d221/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/5c2fa56c/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/5c2fa56c/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/a7ac39ec/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/a7ac39ec/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/adbe4e24/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/adbe4e24/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/b04328a7/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/b04328a7/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/f7b74d75/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20101208/f7b74d75/attachment.html (limited to 'zarb-ml/mageia-sysadm/attachments/20101208') diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/12d1355f/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101208/12d1355f/attachment-0001.html new file mode 100644 index 000000000..f48564054 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/12d1355f/attachment-0001.html @@ -0,0 +1,88 @@ + + + +[545] declare repository_root in manifest + + + + +
+
+
Revision
545
+
Author
blino
+
Date
2010-12-08 08:40:12 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
declare repository_root in manifest
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/manifests/init.pp
+===================================================================
+--- puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:33:58 UTC (rev 544)
++++ puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:40:12 UTC (rev 545)
+@@ -5,6 +5,7 @@
+ 	$build_home_dir = "/home/$build_login"
+ 	$sched_login = "schedbot"
+ 	$sched_home_dir = "/home/$sched_login"
++	$repository_root = "/distrib/bootstrap"
+ 
+ 	include ssh::auth
+ 	ssh::auth::key { $build_login: } # declare a key for build bot: RSA, 2048 bits
+
+Modified: puppet/modules/buildsystem/templates/vhost_repository.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/vhost_repository.conf	2010-12-08 07:33:58 UTC (rev 544)
++++ puppet/modules/buildsystem/templates/vhost_repository.conf	2010-12-08 07:40:12 UTC (rev 545)
+@@ -1,5 +1,4 @@
+ <%
+-repository_root = "/distrib/bootstrap"
+ # FIXME: add a reverse lookup for IPv6 adresses
+ # allowed hosts are: valstar, ecosse, jonund
+ buildsystem_nodes = "2a02:2178:2:7::3/64 2a02:2178:2:7::4/64 2a02:2178:2:7::5/64"
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/12d1355f/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101208/12d1355f/attachment.html new file mode 100644 index 000000000..f48564054 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/12d1355f/attachment.html @@ -0,0 +1,88 @@ + + + +[545] declare repository_root in manifest + + + + +
+
+
Revision
545
+
Author
blino
+
Date
2010-12-08 08:40:12 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
declare repository_root in manifest
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/manifests/init.pp
+===================================================================
+--- puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:33:58 UTC (rev 544)
++++ puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:40:12 UTC (rev 545)
+@@ -5,6 +5,7 @@
+ 	$build_home_dir = "/home/$build_login"
+ 	$sched_login = "schedbot"
+ 	$sched_home_dir = "/home/$sched_login"
++	$repository_root = "/distrib/bootstrap"
+ 
+ 	include ssh::auth
+ 	ssh::auth::key { $build_login: } # declare a key for build bot: RSA, 2048 bits
+
+Modified: puppet/modules/buildsystem/templates/vhost_repository.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/vhost_repository.conf	2010-12-08 07:33:58 UTC (rev 544)
++++ puppet/modules/buildsystem/templates/vhost_repository.conf	2010-12-08 07:40:12 UTC (rev 545)
+@@ -1,5 +1,4 @@
+ <%
+-repository_root = "/distrib/bootstrap"
+ # FIXME: add a reverse lookup for IPv6 adresses
+ # allowed hosts are: valstar, ecosse, jonund
+ buildsystem_nodes = "2a02:2178:2:7::3/64 2a02:2178:2:7::4/64 2a02:2178:2:7::5/64"
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/17fb5de1/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101208/17fb5de1/attachment-0001.html new file mode 100644 index 000000000..d04fae5a2 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/17fb5de1/attachment-0001.html @@ -0,0 +1,77 @@ + + + +[548] do not list unsupported arches + + + + +
+
+
Revision
548
+
Author
blino
+
Date
2010-12-08 08:42:49 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
do not list unsupported arches
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:41:51 UTC (rev 547)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:42:49 UTC (rev 548)
+@@ -13,7 +13,7 @@
+         1.0:
+             arch: i586 x86_64
+         cauldron:
+-            arch: i586 x86_64 sparc sparcv9 ppc
++            arch: i586 x86_64
+ 
+ # targets definition
+ targets:
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/17fb5de1/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101208/17fb5de1/attachment.html new file mode 100644 index 000000000..d04fae5a2 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/17fb5de1/attachment.html @@ -0,0 +1,77 @@ + + + +[548] do not list unsupported arches + + + + +
+
+
Revision
548
+
Author
blino
+
Date
2010-12-08 08:42:49 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
do not list unsupported arches
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:41:51 UTC (rev 547)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:42:49 UTC (rev 548)
+@@ -13,7 +13,7 @@
+         1.0:
+             arch: i586 x86_64
+         cauldron:
+-            arch: i586 x86_64 sparc sparcv9 ppc
++            arch: i586 x86_64
+ 
+ # targets definition
+ targets:
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/4304d221/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101208/4304d221/attachment-0001.html new file mode 100644 index 000000000..eb1f82866 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/4304d221/attachment-0001.html @@ -0,0 +1,76 @@ + + + +[542] remove class bind::bind_master, as this is already by the class dns_server + + + + +
+
+
Revision
542
+
Author
misc
+
Date
2010-12-08 03:56:19 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
remove class bind::bind_master, as this is already by the class dns_server
+ +

Modified Paths

+ + +
+
+Modified: puppet/manifests/nodes.pp
+===================================================================
+--- puppet/manifests/nodes.pp	2010-12-07 03:21:31 UTC (rev 541)
++++ puppet/manifests/nodes.pp	2010-12-08 02:56:19 UTC (rev 542)
+@@ -44,7 +44,6 @@
+ # - LDAP slave
+ # 
+     include default_mageia_server
+-    include bind::bind_master
+     include postgresql::server
+     include dns_server 
+     timezone::timezone { "Europe/Paris": }
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/4304d221/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101208/4304d221/attachment.html new file mode 100644 index 000000000..eb1f82866 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/4304d221/attachment.html @@ -0,0 +1,76 @@ + + + +[542] remove class bind::bind_master, as this is already by the class dns_server + + + + +
+
+
Revision
542
+
Author
misc
+
Date
2010-12-08 03:56:19 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
remove class bind::bind_master, as this is already by the class dns_server
+ +

Modified Paths

+ + +
+
+Modified: puppet/manifests/nodes.pp
+===================================================================
+--- puppet/manifests/nodes.pp	2010-12-07 03:21:31 UTC (rev 541)
++++ puppet/manifests/nodes.pp	2010-12-08 02:56:19 UTC (rev 542)
+@@ -44,7 +44,6 @@
+ # - LDAP slave
+ # 
+     include default_mageia_server
+-    include bind::bind_master
+     include postgresql::server
+     include dns_server 
+     timezone::timezone { "Europe/Paris": }
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/5c2fa56c/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101208/5c2fa56c/attachment-0001.html new file mode 100644 index 000000000..9b347c444 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/5c2fa56c/attachment-0001.html @@ -0,0 +1,77 @@ + + + +[546] use repository_root + + + + +
+
+
Revision
546
+
Author
blino
+
Date
2010-12-08 08:41:19 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
use repository_root
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:40:12 UTC (rev 545)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:41:19 UTC (rev 546)
+@@ -4,7 +4,7 @@
+ repository:
+     class: Youri::Repository::Mandriva_upload
+     options:
+-        install_root: /mnt/BIG/dis/
++        install_root: <%= repository_root %>/distrib
+         upload_root: ${home}/uploads/
+         upload_state: todo done queue
+         queue: todo
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/5c2fa56c/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101208/5c2fa56c/attachment.html new file mode 100644 index 000000000..9b347c444 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/5c2fa56c/attachment.html @@ -0,0 +1,77 @@ + + + +[546] use repository_root + + + + +
+
+
Revision
546
+
Author
blino
+
Date
2010-12-08 08:41:19 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
use repository_root
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:40:12 UTC (rev 545)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:41:19 UTC (rev 546)
+@@ -4,7 +4,7 @@
+ repository:
+     class: Youri::Repository::Mandriva_upload
+     options:
+-        install_root: /mnt/BIG/dis/
++        install_root: <%= repository_root %>/distrib
+         upload_root: ${home}/uploads/
+         upload_state: todo done queue
+         queue: todo
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/a7ac39ec/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101208/a7ac39ec/attachment-0001.html new file mode 100644 index 000000000..f0118d9e1 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/a7ac39ec/attachment-0001.html @@ -0,0 +1,133 @@ + + + +[165] changed layout of registering main page + + + + +
+
+
Revision
165
+
Author
obgr_seneca
+
Date
2010-12-08 18:30:34 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
changed layout of registering main page
+ +

Modified Paths

+ + +
+
+Modified: identity/CatDap/trunk/root/register/index.tt
+===================================================================
+--- identity/CatDap/trunk/root/register/index.tt	2010-12-06 02:21:40 UTC (rev 164)
++++ identity/CatDap/trunk/root/register/index.tt	2010-12-08 17:30:34 UTC (rev 165)
+@@ -11,37 +11,32 @@
+     [% END %]
+ </p>
+ 
++<div id="input_form">
+ <form method="post" action="/register/check">
+-    <p>
+-        <label for="uid_">[% l('Username') %]</label>
+-        <input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" />
+-    </p>
++    <table border=0>
++        <tr>
++			<td><label for="uid_">[% l('Username') %]</label></td>
++			<td><input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" /</td>
++		</tr><tr>
++			<td><label for="gn_">[% l('First name') %]</label></td>
++			<td><input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" /></td>
++		</tr><tr>
++			<td><label for="sn_">[% l('Surname') %]</label></td>
++			<td><input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" /></td>
++		</tr><tr>
++			<td><label for="mail1_">[% l('Email address') %]</label></td>
++			<td><input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" /></td>
++		</tr><tr>
++			<td><label for="mail2_">[% l('Confirm Email address') %]</label></td>
++			<td><input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" /></td>
++		</tr><tr>
++			<td><img src="/register/captcha" /></td>
++			<td><input type="text" name="validate" /></td>
++		</tr><tr>
++			<td colspan="2" style="text-align:center;">
++				<button type="submit" value="[% l('Register') %]">[% l('Register') %]</button>
++			</td>
++		</tr>
+ 
+-    <p>
+-        <label for="gn_">[% l('First name') %]</label>
+-        <input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" />
+-    </p>
+-
+-    <p>
+-        <label for="sn_">[% l('Surname') %]</label>
+-        <input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" />
+-    </p>
+-
+-    <p>
+-        <label for="mail1_">[% l('Email address') %]</label>
+-        <input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" />
+-    </p>
+-
+-    <p>
+-        <label for="mail2_">[% l('Confirm Email address') %]</label>
+-        <input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" />
+-    </p>
+-
+-    <p>
+-        <img src="/register/captcha" />
+-        <input type="text" name="validate" />
+-    </p>
+-
+-    <p><input type="submit" value="[% l('Register') %]" /></p>
+-
+-</form>>>>>>>> .merge-right.r121
++</form>
++</div>
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/a7ac39ec/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101208/a7ac39ec/attachment.html new file mode 100644 index 000000000..f0118d9e1 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/a7ac39ec/attachment.html @@ -0,0 +1,133 @@ + + + +[165] changed layout of registering main page + + + + +
+
+
Revision
165
+
Author
obgr_seneca
+
Date
2010-12-08 18:30:34 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
changed layout of registering main page
+ +

Modified Paths

+ + +
+
+Modified: identity/CatDap/trunk/root/register/index.tt
+===================================================================
+--- identity/CatDap/trunk/root/register/index.tt	2010-12-06 02:21:40 UTC (rev 164)
++++ identity/CatDap/trunk/root/register/index.tt	2010-12-08 17:30:34 UTC (rev 165)
+@@ -11,37 +11,32 @@
+     [% END %]
+ </p>
+ 
++<div id="input_form">
+ <form method="post" action="/register/check">
+-    <p>
+-        <label for="uid_">[% l('Username') %]</label>
+-        <input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" />
+-    </p>
++    <table border=0>
++        <tr>
++			<td><label for="uid_">[% l('Username') %]</label></td>
++			<td><input id="uid_" type="text" name="uid" value="[% c.request.params.uid %]" /</td>
++		</tr><tr>
++			<td><label for="gn_">[% l('First name') %]</label></td>
++			<td><input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" /></td>
++		</tr><tr>
++			<td><label for="sn_">[% l('Surname') %]</label></td>
++			<td><input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" /></td>
++		</tr><tr>
++			<td><label for="mail1_">[% l('Email address') %]</label></td>
++			<td><input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" /></td>
++		</tr><tr>
++			<td><label for="mail2_">[% l('Confirm Email address') %]</label></td>
++			<td><input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" /></td>
++		</tr><tr>
++			<td><img src="/register/captcha" /></td>
++			<td><input type="text" name="validate" /></td>
++		</tr><tr>
++			<td colspan="2" style="text-align:center;">
++				<button type="submit" value="[% l('Register') %]">[% l('Register') %]</button>
++			</td>
++		</tr>
+ 
+-    <p>
+-        <label for="gn_">[% l('First name') %]</label>
+-        <input id="gn_" type="text" name="gn" value="[% c.request.params.gn %]" />
+-    </p>
+-
+-    <p>
+-        <label for="sn_">[% l('Surname') %]</label>
+-        <input id="sn_" type="text" name="sn" value="[% c.request.params.sn %]" />
+-    </p>
+-
+-    <p>
+-        <label for="mail1_">[% l('Email address') %]</label>
+-        <input id="mail1_" type="text" name="mail1" value="[% c.request.params.mail1 %]" />
+-    </p>
+-
+-    <p>
+-        <label for="mail2_">[% l('Confirm Email address') %]</label>
+-        <input id="mail2_" type="text" name="mail2" value="[% c.request.params.mail2 %]" />
+-    </p>
+-
+-    <p>
+-        <img src="/register/captcha" />
+-        <input type="text" name="validate" />
+-    </p>
+-
+-    <p><input type="submit" value="[% l('Register') %]" /></p>
+-
+-</form>>>>>>>> .merge-right.r121
++</form>
++</div>
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/adbe4e24/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101208/adbe4e24/attachment-0001.html new file mode 100644 index 000000000..5741d3181 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/adbe4e24/attachment-0001.html @@ -0,0 +1,95 @@ + + + +[547] use domain variable + + + + +
+
+
Revision
547
+
Author
blino
+
Date
2010-12-08 08:41:51 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
use domain variable
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:41:19 UTC (rev 546)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:41:51 UTC (rev 547)
+@@ -9,7 +9,7 @@
+         upload_state: todo done queue
+         queue: todo
+         noarch: i586
+-        svn: svn+ssh://svn.mageia.org/svn/packages/cauldron/
++        svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/
+         1.0:
+             arch: i586 x86_64
+         cauldron:
+@@ -148,7 +148,7 @@
+         options:
+             user: <%= sched_login %>
+             keep_svn_release: yes
+-            uphost: pkgsubmit.mageia.org
++            uphost: pkgsubmit.<%= domain %>
+             root: ${home}/uploads
+             ssh_key: ${home}/.ssh/id_rsa
+ 
+@@ -156,7 +156,7 @@
+         class: Youri::Submit::Action::Rpminfo
+         options:
+             user:  <%= sched_login %>
+-            uphost: pkgsubmit.mageia.org
++            uphost: pkgsubmit.<%= domain %>
+             root: ${home}/uploads
+             ssh_key: ${home}/.ssh/id_rsa
+ 
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/adbe4e24/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101208/adbe4e24/attachment.html new file mode 100644 index 000000000..5741d3181 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/adbe4e24/attachment.html @@ -0,0 +1,95 @@ + + + +[547] use domain variable + + + + +
+
+
Revision
547
+
Author
blino
+
Date
2010-12-08 08:41:51 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
use domain variable
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:41:19 UTC (rev 546)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:41:51 UTC (rev 547)
+@@ -9,7 +9,7 @@
+         upload_state: todo done queue
+         queue: todo
+         noarch: i586
+-        svn: svn+ssh://svn.mageia.org/svn/packages/cauldron/
++        svn: svn+ssh://svn.<%= domain %>/svn/packages/cauldron/
+         1.0:
+             arch: i586 x86_64
+         cauldron:
+@@ -148,7 +148,7 @@
+         options:
+             user: <%= sched_login %>
+             keep_svn_release: yes
+-            uphost: pkgsubmit.mageia.org
++            uphost: pkgsubmit.<%= domain %>
+             root: ${home}/uploads
+             ssh_key: ${home}/.ssh/id_rsa
+ 
+@@ -156,7 +156,7 @@
+         class: Youri::Submit::Action::Rpminfo
+         options:
+             user:  <%= sched_login %>
+-            uphost: pkgsubmit.mageia.org
++            uphost: pkgsubmit.<%= domain %>
+             root: ${home}/uploads
+             ssh_key: ${home}/.ssh/id_rsa
+ 
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/b04328a7/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101208/b04328a7/attachment-0001.html new file mode 100644 index 000000000..9359efb00 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/b04328a7/attachment-0001.html @@ -0,0 +1,261 @@ + + + +[543] initial youri submit-todo conf + + + + +
+
+
Revision
543
+
Author
blino
+
Date
2010-12-08 08:33:18 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
initial youri submit-todo conf
+ +

Modified Paths

+ + +

Added Paths

+ + +
+
+Modified: puppet/modules/buildsystem/manifests/init.pp
+===================================================================
+--- puppet/modules/buildsystem/manifests/init.pp	2010-12-08 02:56:19 UTC (rev 542)
++++ puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:33:18 UTC (rev 543)
+@@ -128,6 +128,18 @@
+             mode => 440,
+             content => template("buildsystem/sudoers.youri")
+         }
++
++        file { "/etc/youri":
++            ensure => "directory",
++            require => File["/etc/youri"],
++        }
++
++        file { "/etc/youri/submit-todo.conf":
++            ensure => present,
++            mode => 644,
++            require => File["/etc/youri"],
++            content => template("buildsystem/submit-todo.conf")
++        }
+     }
+ 
+     define sshuser($homedir, $comment) {
+
+Added: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	                        (rev 0)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:33:18 UTC (rev 543)
+@@ -0,0 +1,163 @@
++home: <%= sched_home_dir %>
++
++# repository declaration
++repository:
++    class: Youri::Repository::Mandriva_upload
++    options:
++        install_root: /mnt/BIG/dis/
++        upload_root: ${home}/uploads/
++        upload_state: todo done queue
++        queue: todo
++        noarch: i586
++        svn: svn+ssh://svn.mageia.org/svn/packages/cauldron/
++        1.0:
++            arch: i586 x86_64
++        cauldron:
++            arch: i586 x86_64 sparc sparcv9 ppc
++
++# targets definition
++targets:
++    cauldron:
++        checks:
++            - source
++            - version
++            - svn
++            - tag
++            - acl
++            - host
++            - section
++            - rpmlint
++            - recency
++            #- history
++            - queue_recency
++        actions:
++            - send
++            - rpminfo
++
++    1.0:
++        checks:
++            - source
++            - version
++            - svn
++            - tag
++            - acl
++            - host
++            - section
++            - rpmlint
++            - recency
++            #- history
++            - queue_recency
++        actions:
++            - send
++            - rpminfo
++
++# checks definition
++checks:
++    tag:
++        class: Youri::Submit::Check::Tag
++        options:
++            tags:
++                release: '(mnb\d+|mga..\..)$'
++                packager: '<\S+@mageia\.org>$'
++                distribution: '^Mageia'
++                vendor: '^Mageia.Org$'
++
++    recency:
++        class: Youri::Submit::Check::Recency
++
++    queue_recency:
++        class: Youri::Submit::Check::Queue_recency
++
++    host:
++        class: Youri::Submit::Check::Host
++        options:
++                   host_file:  /etc/youri/host.conf
++
++    section:
++        class: Youri::Submit::Check::Section
++
++    rpmlint:
++        class: Youri::Submit::Check::Rpmlint
++        options:
++            config: /etc/rpmlint/config
++            results:
++                - buildprereq-use
++                - no-description-tag
++                - no-summary-tag
++                - non-standard-group
++                - non-xdg-migrated-menu
++                # it breaks dbus
++                #- patch-not-applied
++                - percent-in-conflicts
++                - percent-in-dependency
++                - percent-in-obsoletes
++                - percent-in-provides
++                - summary-ended-with-dot
++
++    svn:
++        class: Youri::Submit::Check::SVN
++
++    acl:
++        class: Youri::Submit::Check::ACL
++        options:
++            acl_file: /etc/youri/acl.conf
++
++    history:
++        class: Youri::Submit::Check::History
++
++    source:
++        class: Youri::Submit::Check::Source
++
++    precedence:
++        class: Youri::Submit::Check::Precedence
++        options:        
++            target: cauldron
++
++    version:
++        class: Youri::Submit::Check::Version
++        options:
++           1.0:
++               authorized_packages: none_package_authorized
++               authorized_sections: main/testing|main/backports|contrib/testing|contrib/updates|contrib/backports|non-free/testing|non-free/updates|non-free/backports
++               authorized_arches: none
++               mode: freeze
++
++           cauldron:
++# <mrl> Prior freeze
++               authorized_sections: ^[a-z]+/(release|testing)$
++               authorized_arches: .*
++               mode: normal
++## <blino> Version freeze
++#               authorized_packages: ^$
++#               authorized_sections: ^main/testing|contrib/testing$
++#               authorized_arches: ^$
++#               authorized_users: ^blino|ennael|nvigier$
++#               mode: version_freeze
++# <mrl> Freeze config
++#               authorized_packages: ^mdkonline|drakxtools|urpmi|ia_ora-gnome|ldetect|ldetect-lst|rpm-mageia-setup|perl-MDK-Common$
++#               authorized_packages: none_package_authorized
++#               authorized_sections: ^restricted/release|main/testing|contrib/testing$
++#               authorized_arches: none
++#               authorized_users: ^blino|ennael|nvigier$
++#               mode: freeze
++
++# actions definitions
++actions:
++    send:
++        class: Youri::Submit::Action::Send
++        options:
++            user: <%= sched_login %>
++            keep_svn_release: yes
++            uphost: pkgsubmit.mageia.org
++            root: ${home}/uploads
++            ssh_key: ${home}/.ssh/id_rsa
++
++    rpminfo:
++        class: Youri::Submit::Action::Rpminfo
++        options:
++            user:  <%= sched_login %>
++            uphost: pkgsubmit.mageia.org
++            root: ${home}/uploads
++            ssh_key: ${home}/.ssh/id_rsa
++
++# vim:ft=yaml:et:sw=4
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/b04328a7/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101208/b04328a7/attachment.html new file mode 100644 index 000000000..9359efb00 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/b04328a7/attachment.html @@ -0,0 +1,261 @@ + + + +[543] initial youri submit-todo conf + + + + +
+
+
Revision
543
+
Author
blino
+
Date
2010-12-08 08:33:18 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
initial youri submit-todo conf
+ +

Modified Paths

+ + +

Added Paths

+ + +
+
+Modified: puppet/modules/buildsystem/manifests/init.pp
+===================================================================
+--- puppet/modules/buildsystem/manifests/init.pp	2010-12-08 02:56:19 UTC (rev 542)
++++ puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:33:18 UTC (rev 543)
+@@ -128,6 +128,18 @@
+             mode => 440,
+             content => template("buildsystem/sudoers.youri")
+         }
++
++        file { "/etc/youri":
++            ensure => "directory",
++            require => File["/etc/youri"],
++        }
++
++        file { "/etc/youri/submit-todo.conf":
++            ensure => present,
++            mode => 644,
++            require => File["/etc/youri"],
++            content => template("buildsystem/submit-todo.conf")
++        }
+     }
+ 
+     define sshuser($homedir, $comment) {
+
+Added: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	                        (rev 0)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2010-12-08 07:33:18 UTC (rev 543)
+@@ -0,0 +1,163 @@
++home: <%= sched_home_dir %>
++
++# repository declaration
++repository:
++    class: Youri::Repository::Mandriva_upload
++    options:
++        install_root: /mnt/BIG/dis/
++        upload_root: ${home}/uploads/
++        upload_state: todo done queue
++        queue: todo
++        noarch: i586
++        svn: svn+ssh://svn.mageia.org/svn/packages/cauldron/
++        1.0:
++            arch: i586 x86_64
++        cauldron:
++            arch: i586 x86_64 sparc sparcv9 ppc
++
++# targets definition
++targets:
++    cauldron:
++        checks:
++            - source
++            - version
++            - svn
++            - tag
++            - acl
++            - host
++            - section
++            - rpmlint
++            - recency
++            #- history
++            - queue_recency
++        actions:
++            - send
++            - rpminfo
++
++    1.0:
++        checks:
++            - source
++            - version
++            - svn
++            - tag
++            - acl
++            - host
++            - section
++            - rpmlint
++            - recency
++            #- history
++            - queue_recency
++        actions:
++            - send
++            - rpminfo
++
++# checks definition
++checks:
++    tag:
++        class: Youri::Submit::Check::Tag
++        options:
++            tags:
++                release: '(mnb\d+|mga..\..)$'
++                packager: '<\S+@mageia\.org>$'
++                distribution: '^Mageia'
++                vendor: '^Mageia.Org$'
++
++    recency:
++        class: Youri::Submit::Check::Recency
++
++    queue_recency:
++        class: Youri::Submit::Check::Queue_recency
++
++    host:
++        class: Youri::Submit::Check::Host
++        options:
++                   host_file:  /etc/youri/host.conf
++
++    section:
++        class: Youri::Submit::Check::Section
++
++    rpmlint:
++        class: Youri::Submit::Check::Rpmlint
++        options:
++            config: /etc/rpmlint/config
++            results:
++                - buildprereq-use
++                - no-description-tag
++                - no-summary-tag
++                - non-standard-group
++                - non-xdg-migrated-menu
++                # it breaks dbus
++                #- patch-not-applied
++                - percent-in-conflicts
++                - percent-in-dependency
++                - percent-in-obsoletes
++                - percent-in-provides
++                - summary-ended-with-dot
++
++    svn:
++        class: Youri::Submit::Check::SVN
++
++    acl:
++        class: Youri::Submit::Check::ACL
++        options:
++            acl_file: /etc/youri/acl.conf
++
++    history:
++        class: Youri::Submit::Check::History
++
++    source:
++        class: Youri::Submit::Check::Source
++
++    precedence:
++        class: Youri::Submit::Check::Precedence
++        options:        
++            target: cauldron
++
++    version:
++        class: Youri::Submit::Check::Version
++        options:
++           1.0:
++               authorized_packages: none_package_authorized
++               authorized_sections: main/testing|main/backports|contrib/testing|contrib/updates|contrib/backports|non-free/testing|non-free/updates|non-free/backports
++               authorized_arches: none
++               mode: freeze
++
++           cauldron:
++# <mrl> Prior freeze
++               authorized_sections: ^[a-z]+/(release|testing)$
++               authorized_arches: .*
++               mode: normal
++## <blino> Version freeze
++#               authorized_packages: ^$
++#               authorized_sections: ^main/testing|contrib/testing$
++#               authorized_arches: ^$
++#               authorized_users: ^blino|ennael|nvigier$
++#               mode: version_freeze
++# <mrl> Freeze config
++#               authorized_packages: ^mdkonline|drakxtools|urpmi|ia_ora-gnome|ldetect|ldetect-lst|rpm-mageia-setup|perl-MDK-Common$
++#               authorized_packages: none_package_authorized
++#               authorized_sections: ^restricted/release|main/testing|contrib/testing$
++#               authorized_arches: none
++#               authorized_users: ^blino|ennael|nvigier$
++#               mode: freeze
++
++# actions definitions
++actions:
++    send:
++        class: Youri::Submit::Action::Send
++        options:
++            user: <%= sched_login %>
++            keep_svn_release: yes
++            uphost: pkgsubmit.mageia.org
++            root: ${home}/uploads
++            ssh_key: ${home}/.ssh/id_rsa
++
++    rpminfo:
++        class: Youri::Submit::Action::Rpminfo
++        options:
++            user:  <%= sched_login %>
++            uphost: pkgsubmit.mageia.org
++            root: ${home}/uploads
++            ssh_key: ${home}/.ssh/id_rsa
++
++# vim:ft=yaml:et:sw=4
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/f7b74d75/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101208/f7b74d75/attachment-0001.html new file mode 100644 index 000000000..29e61fc90 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/f7b74d75/attachment-0001.html @@ -0,0 +1,76 @@ + + + +[544] remove incorrect require for /etc/youri + + + + +
+
+
Revision
544
+
Author
blino
+
Date
2010-12-08 08:33:58 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
remove incorrect require for /etc/youri
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/manifests/init.pp
+===================================================================
+--- puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:33:18 UTC (rev 543)
++++ puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:33:58 UTC (rev 544)
+@@ -131,7 +131,6 @@
+ 
+         file { "/etc/youri":
+             ensure => "directory",
+-            require => File["/etc/youri"],
+         }
+ 
+         file { "/etc/youri/submit-todo.conf":
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101208/f7b74d75/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101208/f7b74d75/attachment.html new file mode 100644 index 000000000..29e61fc90 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101208/f7b74d75/attachment.html @@ -0,0 +1,76 @@ + + + +[544] remove incorrect require for /etc/youri + + + + +
+
+
Revision
544
+
Author
blino
+
Date
2010-12-08 08:33:58 +0100 (Wed, 08 Dec 2010)
+
+ +

Log Message

+
remove incorrect require for /etc/youri
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/manifests/init.pp
+===================================================================
+--- puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:33:18 UTC (rev 543)
++++ puppet/modules/buildsystem/manifests/init.pp	2010-12-08 07:33:58 UTC (rev 544)
+@@ -131,7 +131,6 @@
+ 
+         file { "/etc/youri":
+             ensure => "directory",
+-            require => File["/etc/youri"],
+         }
+ 
+         file { "/etc/youri/submit-todo.conf":
+
+
+ + + \ No newline at end of file -- cgit v1.2.1