From 724174879141bb8e2d46ce88996e294a797b47f9 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sun, 8 Jan 2012 16:58:17 +0000 Subject: move iurt config in a subdirectory --- modules/buildsystem/manifests/iurt.pp | 4 +-- modules/buildsystem/templates/iurt.1.conf | 30 ---------------------- modules/buildsystem/templates/iurt.cauldron.conf | 30 ---------------------- .../buildsystem/templates/iurt.mandriva2010.1.conf | 30 ---------------------- modules/buildsystem/templates/iurt/1.conf | 30 ++++++++++++++++++++++ modules/buildsystem/templates/iurt/cauldron.conf | 30 ++++++++++++++++++++++ .../buildsystem/templates/iurt/mandriva2010.1.conf | 30 ++++++++++++++++++++++ modules/buildsystem/templates/iurt/sudoers.iurt | 1 + modules/buildsystem/templates/sudoers.iurt | 1 - 9 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 modules/buildsystem/templates/iurt.1.conf delete mode 100644 modules/buildsystem/templates/iurt.cauldron.conf delete mode 100644 modules/buildsystem/templates/iurt.mandriva2010.1.conf create mode 100644 modules/buildsystem/templates/iurt/1.conf create mode 100644 modules/buildsystem/templates/iurt/cauldron.conf create mode 100644 modules/buildsystem/templates/iurt/mandriva2010.1.conf create mode 100644 modules/buildsystem/templates/iurt/sudoers.iurt delete mode 100644 modules/buildsystem/templates/sudoers.iurt (limited to 'modules') diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp index b12ec9b0..cbf63b5f 100644 --- a/modules/buildsystem/manifests/iurt.pp +++ b/modules/buildsystem/manifests/iurt.pp @@ -32,14 +32,14 @@ class buildsystem { file { "/etc/iurt/build/$distribution.conf": owner => $build_login, group => $build_login, - content => template("buildsystem/iurt.$distribution.conf") + content => template("buildsystem/iurt/$distribution.conf") } } iurt_config { ["1","cauldron","mandriva2010.1"]: } sudo::sudoers_config { "iurt": - content => template("buildsystem/sudoers.iurt") + content => template("buildsystem/iurt/sudoers.iurt") } } } diff --git a/modules/buildsystem/templates/iurt.1.conf b/modules/buildsystem/templates/iurt.1.conf deleted file mode 100644 index 119ba666..00000000 --- a/modules/buildsystem/templates/iurt.1.conf +++ /dev/null @@ -1,30 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] }, - base_media => [ 'core/release' ], - upload => '<%= build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', - unwanted_packages => '^monotone-', - repository => 'http://repository.<%= domain %>/distrib/', - log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', - admin => 'mageia-sysadm@mageia.org', - 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, - 'libreoffice' => 345600 - }, -} - diff --git a/modules/buildsystem/templates/iurt.cauldron.conf b/modules/buildsystem/templates/iurt.cauldron.conf deleted file mode 100644 index 119ba666..00000000 --- a/modules/buildsystem/templates/iurt.cauldron.conf +++ /dev/null @@ -1,30 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] }, - base_media => [ 'core/release' ], - upload => '<%= build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', - unwanted_packages => '^monotone-', - repository => 'http://repository.<%= domain %>/distrib/', - log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', - admin => 'mageia-sysadm@mageia.org', - 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, - 'libreoffice' => 345600 - }, -} - diff --git a/modules/buildsystem/templates/iurt.mandriva2010.1.conf b/modules/buildsystem/templates/iurt.mandriva2010.1.conf deleted file mode 100644 index 8779a17d..00000000 --- a/modules/buildsystem/templates/iurt.mandriva2010.1.conf +++ /dev/null @@ -1,30 +0,0 @@ -{ - supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] }, - base_media => [ 'main/release' ], - upload => '<%= build_login %>@pkgsubmit:~/uploads/', - upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', - unwanted_packages => '^monotone-', - repository => 'http://repository.<%= domain %>/mandriva/', - rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/', - log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', - admin => 'mageia-sysadm@mageia.org', - 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/buildsystem/templates/iurt/1.conf b/modules/buildsystem/templates/iurt/1.conf new file mode 100644 index 00000000..119ba666 --- /dev/null +++ b/modules/buildsystem/templates/iurt/1.conf @@ -0,0 +1,30 @@ +{ + supported_arch => [ 'i586', 'x86_64' ], + all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] }, + base_media => [ 'core/release' ], + upload => '<%= build_login %>@pkgsubmit:~/uploads/', + upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', + unwanted_packages => '^monotone-', + repository => 'http://repository.<%= domain %>/distrib/', + log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', + admin => 'mageia-sysadm@mageia.org', + 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, + 'libreoffice' => 345600 + }, +} + diff --git a/modules/buildsystem/templates/iurt/cauldron.conf b/modules/buildsystem/templates/iurt/cauldron.conf new file mode 100644 index 00000000..119ba666 --- /dev/null +++ b/modules/buildsystem/templates/iurt/cauldron.conf @@ -0,0 +1,30 @@ +{ + supported_arch => [ 'i586', 'x86_64' ], + all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] }, + base_media => [ 'core/release' ], + upload => '<%= build_login %>@pkgsubmit:~/uploads/', + upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', + unwanted_packages => '^monotone-', + repository => 'http://repository.<%= domain %>/distrib/', + log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', + admin => 'mageia-sysadm@mageia.org', + 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, + 'libreoffice' => 345600 + }, +} + diff --git a/modules/buildsystem/templates/iurt/mandriva2010.1.conf b/modules/buildsystem/templates/iurt/mandriva2010.1.conf new file mode 100644 index 00000000..8779a17d --- /dev/null +++ b/modules/buildsystem/templates/iurt/mandriva2010.1.conf @@ -0,0 +1,30 @@ +{ + supported_arch => [ 'i586', 'x86_64' ], + all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] }, + base_media => [ 'main/release' ], + upload => '<%= build_login %>@pkgsubmit:~/uploads/', + upload_queue => '<%= build_login %>@pkgsubmit:~/uploads/queue/', + unwanted_packages => '^monotone-', + repository => 'http://repository.<%= domain %>/mandriva/', + rsync_to => '<%= build_login %>@pkgsubmit:/mnt/BIG/dis/uploads/build/', + log_url => 'http://pkgsubmit.<%= domain %>/queue/build/', + admin => 'mageia-sysadm@mageia.org', + 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/buildsystem/templates/iurt/sudoers.iurt b/modules/buildsystem/templates/iurt/sudoers.iurt new file mode 100644 index 00000000..266f301c --- /dev/null +++ b/modules/buildsystem/templates/iurt/sudoers.iurt @@ -0,0 +1 @@ +<%= build_login %> ALL = NOPASSWD: /usr/sbin/iurt_root_command diff --git a/modules/buildsystem/templates/sudoers.iurt b/modules/buildsystem/templates/sudoers.iurt deleted file mode 100644 index 266f301c..00000000 --- a/modules/buildsystem/templates/sudoers.iurt +++ /dev/null @@ -1 +0,0 @@ -<%= build_login %> ALL = NOPASSWD: /usr/sbin/iurt_root_command -- cgit v1.2.1