diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2012-12-11 18:33:21 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2012-12-11 18:33:21 +0000 |
| commit | 740284eeb687fb7cd34d034558829a2d56e2d6ba (patch) | |
| tree | 2e1256a21882b03fbceef990394e148e9b27f5b3 /modules/buildsystem/manifests | |
| parent | c5853d4791fea6f783b3b5cf9d2b6ff0285df8fa (diff) | |
| download | puppet-740284eeb687fb7cd34d034558829a2d56e2d6ba.tar puppet-740284eeb687fb7cd34d034558829a2d56e2d6ba.tar.gz puppet-740284eeb687fb7cd34d034558829a2d56e2d6ba.tar.bz2 puppet-740284eeb687fb7cd34d034558829a2d56e2d6ba.tar.xz puppet-740284eeb687fb7cd34d034558829a2d56e2d6ba.zip | |
Create buildsystem::var::youri
The class buildsystem::var::youri has been created to set the youri
configuration.
Diffstat (limited to 'modules/buildsystem/manifests')
| -rw-r--r-- | modules/buildsystem/manifests/var/youri.pp | 13 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/youri_submit.pp | 18 |
2 files changed, 20 insertions, 11 deletions
diff --git a/modules/buildsystem/manifests/var/youri.pp b/modules/buildsystem/manifests/var/youri.pp new file mode 100644 index 00000000..7732c8f5 --- /dev/null +++ b/modules/buildsystem/manifests/var/youri.pp @@ -0,0 +1,13 @@ +# $tmpl_youri_upload_conf: +# template file for youri submi-upload.conf +# $tmpl_youri_todo_conf: +# template file for youri submit-todo.conf +# $packages_archivedir: +# the directory where youri will archive old packages when they are +# replaced by a new version +class buildsystem::var::youri( + $tmpl_youri_upload_conf = 'buildsystem/youri/submit-upload.conf', + $tmpl_youri_todo_conf = 'buildsystem/youri/submit-todo.conf', + $packages_archivedir +) { +} diff --git a/modules/buildsystem/manifests/youri_submit.pp b/modules/buildsystem/manifests/youri_submit.pp index 5b02a067..f55402d8 100644 --- a/modules/buildsystem/manifests/youri_submit.pp +++ b/modules/buildsystem/manifests/youri_submit.pp @@ -3,11 +3,7 @@ class buildsystem::youri_submit { include buildsystem::rpmlint include buildsystem::repository include buildsystem::var::scheduler - - $repository_root = $buildsystem::var::repository::bootstrap_root - $sched_home_dir = $buildsystem::var::scheduler::homedir - $sched_login = $buildsystem::var::scheduler::login - $packages_archivedir = "$sched_home_dir/old" + include buildsystem::var::youri mga-common::local_script { 'mga-youri-submit': @@ -29,20 +25,20 @@ class buildsystem::youri_submit { '/etc/youri/': ensure => 'directory'; '/etc/youri/submit-todo.conf': - content => template('buildsystem/youri/submit-todo.conf'); + content => template($buildsystem::var::youri::tmpl_youri_todo_conf); '/etc/youri/submit-upload.conf': - content => template('buildsystem/youri/submit-upload.conf'); + content => template($buildsystem::var::youri::tmpl_youri_upload_conf); '/etc/youri/acl.conf': content => template('buildsystem/youri/acl.conf'); } - file { $packages_archivedir: + file { $buildsystem::var::youri::packages_archivedir: ensure => 'directory', - owner => $sched_login, - require => File[$sched_home_dir], + owner => $buildsystem::var::scheduler::login, + require => File[$buildsystem::var::scheduler::homedir], } - tidy { $packages_archivedir: + tidy { $buildsystem::var::youri::packages_archivedir: type => 'ctime', recurse => true, age => '1w', |