aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/manifests/create_upload_dir.rb
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-02-18 13:09:09 +0000
committerPascal Terjan <pterjan@mageia.org>2012-02-18 13:09:09 +0000
commitc5f942af5a1a8ff4b4fa90fc8be8cb673368dfed (patch)
tree53220593479a201d55a1e02e1f7456849865b25d /modules/buildsystem/manifests/create_upload_dir.rb
parent7ee2b5f00043a098083bc10132073db53b7abe22 (diff)
downloadpuppet-c5f942af5a1a8ff4b4fa90fc8be8cb673368dfed.tar
puppet-c5f942af5a1a8ff4b4fa90fc8be8cb673368dfed.tar.gz
puppet-c5f942af5a1a8ff4b4fa90fc8be8cb673368dfed.tar.bz2
puppet-c5f942af5a1a8ff4b4fa90fc8be8cb673368dfed.tar.xz
puppet-c5f942af5a1a8ff4b4fa90fc8be8cb673368dfed.zip
Get config out of create_upload_dir.rb
Diffstat (limited to 'modules/buildsystem/manifests/create_upload_dir.rb')
-rw-r--r--modules/buildsystem/manifests/create_upload_dir.rb23
1 files changed, 2 insertions, 21 deletions
diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb
index 609d7dd4..dd30d00d 100644
--- a/modules/buildsystem/manifests/create_upload_dir.rb
+++ b/modules/buildsystem/manifests/create_upload_dir.rb
@@ -1,23 +1,4 @@
-define "create_upload_dir", :owner, :group do
-
- #FIXME: move this config info outside of this code
- releases = {
- 'cauldron' => {
- 'core' => ['release','updates_testing','backports_testing','backports','updates'],
- 'nonfree' => ['release','updates_testing','backports_testing','backports','updates'],
- 'tainted' => ['release','updates_testing','backports_testing','backports','updates'],
- },
- '1' => {
- 'core' => ['release','updates_testing','backports_testing','backports','updates'],
- 'nonfree' => ['release','updates_testing','backports_testing','backports','updates'],
- 'tainted' => ['release','updates_testing','backports_testing','backports','updates'],
- },
- 'infra_1' => {
- 'infra' => ['release']
- },
- }
-
-
+define "create_upload_dir", :owner, :group, :releases do
states = ["todo","done","failure","queue","rejected"]
file @name, :ensure => 'directory', :owner => @owner, :group => @group
@@ -25,7 +6,7 @@ define "create_upload_dir", :owner, :group do
for st in states do
file [@name, st].join('/'), :ensure => 'directory', :owner => @owner, :group => @group
- releases.each{|rel, repositories|
+ @releases.each{|rel, repositories|
file [@name, st, rel].join('/'), :ensure => 'directory', :owner => @owner, :group => @group
repositories.each{|rep, medias|