[Mageia-sysadm] [734] do not hardcode iurt login and home

[root at mageia.org]

Revision: 734
Author:   blino
Date:     2011-01-09 00:07:43 +0100 (Sun, 09 Jan 2011)
Log Message:
-----------
do not hardcode iurt login and home

Modified Paths:
--------------
    puppet/modules/buildsystem/templates/iurt.cauldron.conf
    puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf
    puppet/modules/buildsystem/templates/upload.conf

Modified: puppet/modules/buildsystem/templates/iurt.cauldron.conf
===================================================================
--- puppet/modules/buildsystem/templates/iurt.cauldron.conf	2011-01-08 23:03:24 UTC (rev 733)
+++ puppet/modules/buildsystem/templates/iurt.cauldron.conf	2011-01-08 23:07:43 UTC (rev 734)
@@ -1,11 +1,11 @@
 {
  supported_arch => [ 'i586', 'x86_64' ],
  all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] },
- upload => 'iurt at pkgsubmit:~/uploads/',
- upload_queue => 'iurt at pkgsubmit:~/uploads/queue/',
+ upload => '<%= build_login %>@pkgsubmit:~/uploads/',
+ upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
  unwanted_packages => '^monotone-',
  repository => 'http://repository.<%= domain %>/distrib/',
- rsync_to => 'iurt at pkgsubmit:/mnt/BIG/dis/uploads/build/',
+ rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/',
  log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
  admin => 'mageia-sysadm at mageia.org',
  packager => 'Iurt the rebuild bot <mageia-sysadm at mageia.org>',

Modified: puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf
===================================================================
--- puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf	2011-01-08 23:03:24 UTC (rev 733)
+++ puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf	2011-01-08 23:07:43 UTC (rev 734)
@@ -1,11 +1,11 @@
 {
  supported_arch => [ 'i586', 'x86_64' ],
  all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] },
- upload => 'iurt at pkgsubmit:~/uploads/',
- upload_queue => 'iurt at pkgsubmit:~/uploads/queue/',
+ upload => '<%= build_login %>@pkgsubmit:~/uploads/',
+ upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/',
  unwanted_packages => '^monotone-',
  repository => 'http://repository.<%= domain %>/mandriva/',
- rsync_to => 'iurt at pkgsubmit:/mnt/BIG/dis/uploads/build/',
+ rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/',
  log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
  admin => 'mageia-sysadm at mageia.org',
  packager => 'Iurt the rebuild bot <mageia-sysadm at mageia.org>',

Modified: puppet/modules/buildsystem/templates/upload.conf
===================================================================
--- puppet/modules/buildsystem/templates/upload.conf	2011-01-08 23:03:24 UTC (rev 733)
+++ puppet/modules/buildsystem/templates/upload.conf	2011-01-08 23:07:43 UTC (rev 734)
@@ -12,7 +12,7 @@
    x86_64 => [ qw(jonund) ],
 );
 my $repository = "http://repository.<%= domain %>/distrib/";
-my $homedir = "/home/iurt";
+my $homedir = "<%= build_home_dir %>";
 
 {
     bot => {
@@ -23,7 +23,7 @@
                     my $node = $_;
                     ($node => {	       
                         iurt => {
-                            user => 'iurt',
+                            user => '<%= build_login %>',
 # (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind
 #                           command => "iurt --copy-srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository --additional-media -m __MEDIA__ -- file://$homedir/cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
                             command => "iurt --copy_srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110109/db50235f/attachment-0001.html>