[Mageia-sysadm] [677] Adapt configs to Mageia mirror structure

[root at mageia.org]

Revision: 677
Author:   pterjan
Date:     2011-01-06 14:18:01 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
Adapt configs to Mageia mirror structure

Modified Paths:
--------------
    puppet/modules/buildsystem/templates/iurt.cauldron.conf
    puppet/modules/buildsystem/templates/submit-todo.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 03:04:45 UTC (rev 676)
+++ puppet/modules/buildsystem/templates/iurt.cauldron.conf	2011-01-06 13:18:01 UTC (rev 677)
@@ -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 at pkgsubmit:~/uploads/',
  upload_queue => 'iurt at pkgsubmit:~/uploads/queue/',
  unwanted_packages => '^monotone-',

Modified: puppet/modules/buildsystem/templates/submit-todo.conf
===================================================================
--- puppet/modules/buildsystem/templates/submit-todo.conf	2011-01-06 03:04:45 UTC (rev 676)
+++ puppet/modules/buildsystem/templates/submit-todo.conf	2011-01-06 13:18:01 UTC (rev 677)
@@ -122,7 +122,7 @@
         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
 

Modified: puppet/modules/buildsystem/templates/upload.conf
===================================================================
--- puppet/modules/buildsystem/templates/upload.conf	2011-01-06 03:04:45 UTC (rev 676)
+++ puppet/modules/buildsystem/templates/upload.conf	2011-01-06 13:18:01 UTC (rev 677)
@@ -36,19 +36,33 @@
       },
       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 at mageia.org',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110106/6411a4ea/attachment.html>