diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:06:25 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:06:25 +0000 |
| commit | 14f898ccf52e939055124855d465b11ca502b33b (patch) | |
| tree | fc9c3163ec94f1bfa466df608d5247cb04250a67 /modules | |
| parent | 3c7f02d481edc662ee490525cff939074ff36b38 (diff) | |
| download | puppet-14f898ccf52e939055124855d465b11ca502b33b.tar puppet-14f898ccf52e939055124855d465b11ca502b33b.tar.gz puppet-14f898ccf52e939055124855d465b11ca502b33b.tar.bz2 puppet-14f898ccf52e939055124855d465b11ca502b33b.tar.xz puppet-14f898ccf52e939055124855d465b11ca502b33b.zip | |
buildsystem::var::scheduler: add admin_mail parameter
The admin_mail parameter is used to select the email address sending the
build failure notifications.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/manifests/var/scheduler.pp | 7 | ||||
| -rw-r--r-- | modules/buildsystem/templates/upload.conf | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/modules/buildsystem/manifests/var/scheduler.pp b/modules/buildsystem/manifests/var/scheduler.pp index 47933b0b..a6b9ef4f 100644 --- a/modules/buildsystem/manifests/var/scheduler.pp +++ b/modules/buildsystem/manifests/var/scheduler.pp @@ -1,4 +1,9 @@ -class buildsystem::var::scheduler { +# $admin_mail: +# the email address from which the build failure notifications +# will be sent +class buildsystem::var::scheduler( + $admin_mail = "root@${::domain}" +){ $login = 'schedbot' $homedir = "/var/lib/$login" $logdir = "/var/log/$login" diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf index a5c7ed8d..c3471219 100644 --- a/modules/buildsystem/templates/upload.conf +++ b/modules/buildsystem/templates/upload.conf @@ -89,7 +89,7 @@ my $homedir = "<%= scope.lookupvar('buildsystem::var::iurt::homedir') %>"; } -%> }, - admin => 'mageia-sysadm@mageia.org', + admin => '<%= scope.lookupvar('buildsystem::var::scheduler::admin_mail') %>', http_queue => 'http://<%= scope.lookupvar('buildsystem::var::webstatus::hostname') %>/uploads', upload_user => '<%= scope.lookupvar('buildsystem::var::scheduler::login') %>', email_domain => '<%= domain %>', |