diff options
Diffstat (limited to 'modules/buildsystem/manifests')
-rw-r--r-- | modules/buildsystem/manifests/create_upload_dir.rb | 16 | ||||
-rw-r--r-- | modules/buildsystem/manifests/init.pp | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb index d608b734..16a24177 100644 --- a/modules/buildsystem/manifests/create_upload_dir.rb +++ b/modules/buildsystem/manifests/create_upload_dir.rb @@ -1,23 +1,27 @@ -define "create_upload_dir", :owner do +define "create_upload_dir", :owner, :group do states = ["todo","done","failure","queue","rejected"] releases = ["cauldron"] repositories = ["core","nonfree","tainted"] medias = ['release','updates_testing','backports_testing','backports','updates'] - file @name, :ensure => 'directory', :owner => @owner + file @name, :ensure => 'directory', :owner => @owner, :group => @group for st in states do - file [@name, st].join('/'), :ensure => 'directory', :owner => @owner + file [@name, st].join('/'), :ensure => 'directory', :owner => @owner, :group => @group for rel in releases do - file [@name, st, rel].join('/'), :ensure => 'directory', :owner => @owner + file [@name, st, rel].join('/'), :ensure => 'directory', :owner => @owner, :group => @group for rep in repositories do - file [@name, st, rel, rep].join('/'), :ensure => 'directory', :owner => @owner + file [@name, st, rel, rep].join('/'), :ensure => 'directory', :owner => @owner, :group => @group for med in medias do - file [@name, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => @owner + if st == 'done' + file [@name, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => @owner, :group => @group, :mode => 0775 + else + file [@name, st, rel, rep, med].join('/'), :ensure => 'directory', :owner => @owner, :group => @group + end end end end diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index 83789592..a081feda 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -151,6 +151,7 @@ class buildsystem { import "create_upload_dir.rb" create_upload_dir { "$sched_home_dir/uploads": owner => $sched_login, + group => $sched_login, } } |