diff options
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 4 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/scheduler.pp | 7 | ||||
| -rw-r--r-- | modules/buildsystem/templates/upload.conf | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 8171961b..ade1cb92 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -8,7 +8,9 @@ class mga_buildsystem::config { packagers_committers => 'mga-packagers-committers', } - include buildsystem::var::scheduler + class { 'buildsystem::var::scheduler' : + admin_mail => 'mageia-sysadm@mageia.org', + } include buildsystem::var::repository class { 'buildsystem::var::youri': packages_archivedir => "${buildsystem::var::scheduler::homedir}/old", 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 %>', |