diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2011-01-06 13:18:01 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2011-01-06 13:18:01 +0000 |
| commit | fc25e3ee46fd347547885ec302636df9a5d9af9b (patch) | |
| tree | b10db53a3dd236c9a9e26ab26bcca187f2cc00e2 /modules | |
| parent | 8565bded490193e6617b7b70963da78b0df94c51 (diff) | |
| download | puppet-fc25e3ee46fd347547885ec302636df9a5d9af9b.tar puppet-fc25e3ee46fd347547885ec302636df9a5d9af9b.tar.gz puppet-fc25e3ee46fd347547885ec302636df9a5d9af9b.tar.bz2 puppet-fc25e3ee46fd347547885ec302636df9a5d9af9b.tar.xz puppet-fc25e3ee46fd347547885ec302636df9a5d9af9b.zip | |
Adapt configs to Mageia mirror structure
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/templates/iurt.cauldron.conf | 2 | ||||
| -rw-r--r-- | modules/buildsystem/templates/submit-todo.conf | 2 | ||||
| -rw-r--r-- | modules/buildsystem/templates/upload.conf | 40 |
3 files changed, 29 insertions, 15 deletions
diff --git a/modules/buildsystem/templates/iurt.cauldron.conf b/modules/buildsystem/templates/iurt.cauldron.conf index aeb599ae..05c79366 100644 --- a/modules/buildsystem/templates/iurt.cauldron.conf +++ b/modules/buildsystem/templates/iurt.cauldron.conf @@ -1,6 +1,6 @@ { supported_arch => [ 'i586', 'x86_64' ], - all_media => { 'main' => [ 'release' ], 'contrib' => [ 'release' ] }, + all_media => { 'core' => [ 'release' ], 'nonfree' => [ 'release' ], 'tainted' => [ 'release' ] }, upload => 'iurt@pkgsubmit:~/uploads/', upload_queue => 'iurt@pkgsubmit:~/uploads/queue/', unwanted_packages => '^monotone-', diff --git a/modules/buildsystem/templates/submit-todo.conf b/modules/buildsystem/templates/submit-todo.conf index b89192f4..745e3636 100644 --- a/modules/buildsystem/templates/submit-todo.conf +++ b/modules/buildsystem/templates/submit-todo.conf @@ -122,7 +122,7 @@ checks: options: 1.0: authorized_packages: none_package_authorized - authorized_sections: main/testing|main/backports|contrib/testing|contrib/updates|contrib/backports|non-free/testing|non-free/updates|non-free/backports + authorized_sections: ^[a-z]+/(updates|testing|backports|backports_testing)$ authorized_arches: none mode: freeze diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf index 93ed5d8e..9c94ad6c 100644 --- a/modules/buildsystem/templates/upload.conf +++ b/modules/buildsystem/templates/upload.conf @@ -36,19 +36,33 @@ my $homedir = "/home/iurt"; }, media => { default => { - "main/release" => [ "main/updates", "main/release" ], - "main/updates" => [ "main/updates", "main/release" ], - "main/testing" => [ "main/testing", "main/updates", "main/release" ], - "main/backports" => [ "main/backports", "main/updates", "main/release" ], - "contrib/release" => [ "main/updates", "main/release", "contrib/updates", "contrib/release" ], - "contrib/updates" => [ "main/updates", "main/release", "contrib/updates", "contrib/release" ], - "contrib/testing" => [ "main/updates", "main/release", "main/testing", "contrib/updates", "contrib/release", "contrib/testing" ], - "contrib/backports" => [ "main/backports", "main/updates", "main/release", "contrib/backports", "contrib/updates", "contrib/release" ], - # (blino) non-free packages may require contrib packages (gcc3.3-g77 for scilab) - "non-free/release" => [ "main/updates", "main/release", "contrib/updates", "contrib/release", "non-free/updates", "non-free/release" ], - "non-free/updates" => [ "main/updates", "main/release", "contrib/updates", "contrib/release", "non-free/updates", "non-free/release" ], - "non-free/testing" => [ "main/updates", "main/release", "main/testing", "contrib/updates", "contrib/release", "contrib/testing", "non-free/updates", "non-free/release", "non-free/testing" ], - "non-free/backports" => [ "main/backports", "main/release", "main/updates", "contrib/backports", "contrib/updates", "contrib/release", "non-free/backports", "non-free/updates", "non-free/release" ], + "core/release" => [ "core/updates", "core/release" ], + "core/updates" => [ "core/updates", "core/release" ], + "core/testing" => [ "core/testing", "core/updates", "core/release" ], + "core/backports" => [ "core/backports", "core/testing", "core/updates", "core/release" ], + "core/backports_testing" => [ "core/backports_testing", "core/backports", "core/testing", "core/updates", "core/release" ], + "nonfree/release" => [ "core/release", "nonfree/release" ], + "nonfree/updates" => [ "core/updates", "core/release", "nonfree/release", "nonfree/updates" ], + "nonfree/testing" => [ "core/updates", "core/release", "core/testing", "nonfree/release", "nonfree/updates", "nonfree/testing" ], + "nonfree/backports" => [ "core/backports", "core/testing", "core/updates", "core/release", + "nonfree/release", "nonfree/updates", "nonfree/testing", "nonfree/backports" ], + "nonfree/backports_testing" => [ "core/backports_testing", "core/backports", "core/testing", "core/updates", "core/release", + "nonfree/release", "nonfree/updates", "nonfree/testing", "nonfree/backports", "nonfree/backports_testing" ], + "tainted/release" => [ "core/release", "nonfree/release", "tainted/release" ], + "tainted/updates" => [ "core/release", "nonfree/release", "tainted/release", + "core/updates", "nonfree/updates", "tainted/updates" ], + "tainted/testing" => [ "core/release", "nonfree/release", "tainted/release", + "core/updates", "nonfree/updates", "tainted/updates", + "core/testing", "nonfree/testing", "tainted/testing" ], + "tainted/backports" => [ "core/release", "nonfree/release", "tainted/release", + "core/updates", "nonfree/updates", "tainted/updates", + "core/testing", "nonfree/testing", "tainted/testing", + "core/backports", "nonfree/backports", "tainted/backports" ], + "tainted/backports_testing" => [ "core/release", "nonfree/release", "tainted/release", + "core/updates", "nonfree/updates", "tainted/updates", + "core/testing", "nonfree/testing", "tainted/testing", + "core/backports", "nonfree/backports", "tainted/backports", + "core/backports_testing", "nonfree/backports_testing", "tainted/backports_testing" ], }, }, admin => 'mageia-sysadm@mageia.org', |