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/templates/youri | |
| 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/templates/youri')
| -rw-r--r-- | modules/buildsystem/templates/youri/submit-todo.conf | 3 | ||||
| -rw-r--r-- | modules/buildsystem/templates/youri/submit-upload.conf | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/modules/buildsystem/templates/youri/submit-todo.conf b/modules/buildsystem/templates/youri/submit-todo.conf index 2d5d18ff..f647f231 100644 --- a/modules/buildsystem/templates/youri/submit-todo.conf +++ b/modules/buildsystem/templates/youri/submit-todo.conf @@ -1,5 +1,8 @@ <% escaped_domain = domain.gsub('.','\.') +repository_root = scope.lookupvar('buildsystem::var::repository::bootstrap_root') +sched_home_dir = scope.lookupvar('buildsystem::var::scheduler::homedir') +sched_login = scope.lookupvar('buildsystem::var::scheduler::login') %> home: <%= sched_home_dir %> diff --git a/modules/buildsystem/templates/youri/submit-upload.conf b/modules/buildsystem/templates/youri/submit-upload.conf index bab096da..fa9adce3 100644 --- a/modules/buildsystem/templates/youri/submit-upload.conf +++ b/modules/buildsystem/templates/youri/submit-upload.conf @@ -1,6 +1,9 @@ <% Puppet::Parser::Functions.autoloader.loadall escaped_domain = domain.gsub('.','\.') +repository_root = scope.lookupvar('buildsystem::var::repository::bootstrap_root') +sched_home_dir = scope.lookupvar('buildsystem::var::scheduler::homedir') +sched_login = scope.lookupvar('buildsystem::var::scheduler::login') %> home: <%= sched_home_dir %> @@ -11,7 +14,7 @@ repository: options: install_root: <%= repository_root %>/distrib upload_root: ${home}/uploads/ - archive_root: <%= packages_archivedir %> + archive_root: <%= scope.lookupvar('buildsystem::var::youri::packages_archivedir') %> upload_state: queue queue: queue noarch: i586 |