Revision
443
Author
blino
Date
2010-11-24 01:27:43 +0100 (Wed, 24 Nov 2010)

Log Message

extract homedir

Modified Paths

Modified: puppet/modules/buildsystem/templates/upload.conf
===================================================================
--- puppet/modules/buildsystem/templates/upload.conf	2010-11-24 00:25:57 UTC (rev 442)
+++ puppet/modules/buildsystem/templates/upload.conf	2010-11-24 00:27:43 UTC (rev 443)
@@ -12,6 +12,7 @@
    x86_64 => [ qw(jonund) ],
 );
 my $repository = "http://repository/distrib/";
+my $homedir = "/home/iurt";
 
 {
     bot => {
@@ -24,10 +25,10 @@
                         iurt => {
                             user => 'iurt',
 # (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind
-#			command => "iurt --iurtlogdir __IURTLOGDIR__ --copy-srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository --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__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
-                            packages => '/home/iurt/iurt/',
-                            log => '/home/iurt/iurt/', 
+#			command => "iurt --iurtlogdir __IURTLOGDIR__ --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 --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
+                            packages => '$homedir/iurt/',
+                            log => '$homedir/iurt/', 
                         },
                     });
                 } @{$nodes{$arch}},