From de5ae419f88ddc5c64cb03074a7d86d422d87ca0 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mon, 8 Nov 2010 01:54:30 +0000 Subject: - no need to have a hidden file in the svn repository and puppet config --- modules/iurt/manifests/init.pp | 2 +- modules/iurt/templates/.iurt.cauldron.conf | 30 ------------------------------ modules/iurt/templates/iurt.cauldron.conf | 30 ++++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 modules/iurt/templates/.iurt.cauldron.conf create mode 100644 modules/iurt/templates/iurt.cauldron.conf (limited to 'modules') diff --git a/modules/iurt/manifests/init.pp b/modules/iurt/manifests/init.pp index 2da49201..366e100f 100644 --- a/modules/iurt/manifests/init.pp +++ b/modules/iurt/manifests/init.pp @@ -13,7 +13,7 @@ class iurt { owner => buildbot, group => buildbot, mode => 644, - content => template("iurt/.iurt.cauldron.conf") + content => template("iurt/iurt.cauldron.conf") } } diff --git a/modules/iurt/templates/.iurt.cauldron.conf b/modules/iurt/templates/.iurt.cauldron.conf deleted file mode 100644 index 5a7f047e..00000000 --- a/modules/iurt/templates/.iurt.cauldron.conf +++ /dev/null @@ -1,30 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] }, - upload => 'schedbot@pkgsubmit:~/uploads/', - upload_queue => 'schedbot@pkgsubmit:~/uploads/queue/', - unwanted_packages => '^monotone-', - repository => '/mnt/BIG/dis/', - rsync_to => 'schedbot@pkgsubmit:/mnt/BIG/dis/uploads/build/', - log_url => 'http://pkgsubmit.mageia.org/queue/build/', - admin => 'mageia-sysadm@mageia.org', - iurt_root_command => '/home/buildbot/iurt-trunk/iurt_root_command', - packager => 'Iurt the rebuild bot ', - sendmail => 0, - build_timeout => { - 'default' => 18000, - 'gcc' => 57600, - 'paraview' => 115200, - 'salome' => 57600, - 'itk' => 115200, - 'wrapitk' => 115200, - 'kernel-rt' => 57600, - 'kernel-xen' => 57600, - 'kernel-tmb' => 57600, - 'openoffice.org' => 345600, - 'openoffice.org64' => 345600, - 'openoffice.org-go-ooo' => 345600, - 'openoffice.org64-go-ooo' => 345600 - }, -} - diff --git a/modules/iurt/templates/iurt.cauldron.conf b/modules/iurt/templates/iurt.cauldron.conf new file mode 100644 index 00000000..5a7f047e --- /dev/null +++ b/modules/iurt/templates/iurt.cauldron.conf @@ -0,0 +1,30 @@ +{ + supported_arch => [ 'i586', 'x86_64' ], + all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] }, + upload => 'schedbot@pkgsubmit:~/uploads/', + upload_queue => 'schedbot@pkgsubmit:~/uploads/queue/', + unwanted_packages => '^monotone-', + repository => '/mnt/BIG/dis/', + rsync_to => 'schedbot@pkgsubmit:/mnt/BIG/dis/uploads/build/', + log_url => 'http://pkgsubmit.mageia.org/queue/build/', + admin => 'mageia-sysadm@mageia.org', + iurt_root_command => '/home/buildbot/iurt-trunk/iurt_root_command', + packager => 'Iurt the rebuild bot ', + sendmail => 0, + build_timeout => { + 'default' => 18000, + 'gcc' => 57600, + 'paraview' => 115200, + 'salome' => 57600, + 'itk' => 115200, + 'wrapitk' => 115200, + 'kernel-rt' => 57600, + 'kernel-xen' => 57600, + 'kernel-tmb' => 57600, + 'openoffice.org' => 345600, + 'openoffice.org64' => 345600, + 'openoffice.org-go-ooo' => 345600, + 'openoffice.org64-go-ooo' => 345600 + }, +} + -- cgit v1.2.1