[Mageia-sysadm] [668] - do not hardcode domain name ( as this complexify deploymement on a separate

[root at mageia.org]

Revision: 668
Author:   misc
Date:     2011-01-06 01:06:30 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
- do not hardcode domain name ( as this complexify deploymement on a separate 
test set of server )

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-06 00:05:31 UTC (rev 667)
+++ puppet/modules/buildsystem/templates/iurt.cauldron.conf	2011-01-06 00:06:30 UTC (rev 668)
@@ -4,9 +4,9 @@
  upload => 'iurt at pkgsubmit:~/uploads/',
  upload_queue => 'iurt at pkgsubmit:~/uploads/queue/',
  unwanted_packages => '^monotone-',
- repository => 'http://repository.mageia.org/distrib/',
+ repository => 'http://repository.<%= domain %>/distrib/',
  rsync_to => 'iurt at pkgsubmit:/mnt/BIG/dis/uploads/build/',
- log_url => 'http://pkgsubmit.mageia.org/queue/build/',
+ log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
  admin => 'mageia-sysadm at mageia.org',
  packager => 'Iurt the rebuild bot <mageia-sysadm at mageia.org>',
  sendmail => 0,

Modified: puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf
===================================================================
--- puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf	2011-01-06 00:05:31 UTC (rev 667)
+++ puppet/modules/buildsystem/templates/iurt.mandriva2010.1.conf	2011-01-06 00:06:30 UTC (rev 668)
@@ -4,9 +4,9 @@
  upload => 'iurt at pkgsubmit:~/uploads/',
  upload_queue => 'iurt at pkgsubmit:~/uploads/queue/',
  unwanted_packages => '^monotone-',
- repository => 'http://repository.mageia.org/mandriva/',
+ repository => 'http://repository.<%= domain %>/mandriva/',
  rsync_to => 'iurt at pkgsubmit:/mnt/BIG/dis/uploads/build/',
- log_url => 'http://pkgsubmit.mageia.org/queue/build/',
+ log_url => 'http://pkgsubmit.<%= domain %>/queue/build/',
  admin => 'mageia-sysadm at mageia.org',
  packager => 'Iurt the rebuild bot <mageia-sysadm at mageia.org>',
  sendmail => 0,

Modified: puppet/modules/buildsystem/templates/upload.conf
===================================================================
--- puppet/modules/buildsystem/templates/upload.conf	2011-01-06 00:05:31 UTC (rev 667)
+++ puppet/modules/buildsystem/templates/upload.conf	2011-01-06 00:06:30 UTC (rev 668)
@@ -11,7 +11,7 @@
    i586 => [ qw(ecosse) ],
    x86_64 => [ qw(jonund) ],
 );
-my $repository = "http://repository.mageia.org/distrib/";
+my $repository = "http://repository.<%= domain %>/distrib/";
 my $homedir = "/home/iurt";
 
 {
@@ -52,6 +52,6 @@
 	    },
       },
       admin => 'mageia-sysadm at mageia.org',
-      http_queue => 'http://pkgsubmit.mageia.org/uploads',
+      http_queue => 'http://pkgsubmit.<%= domain %>/uploads',
       upload_user => 'schedbot',
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110106/6c7a8f43/attachment.html>