aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-08-18 17:52:07 +0000
committerNicolas Vigier <boklm@mageia.org>2011-08-18 17:52:07 +0000
commitb7c7feee5370eb25d0c8fab484c54c9e3e4ab6c2 (patch)
tree52d804838795422293c9d3de67e7725ef20ff495 /modules
parent58bcccda1972ca8015897c3b08c5c2765884f738 (diff)
downloadpuppet-b7c7feee5370eb25d0c8fab484c54c9e3e4ab6c2.tar
puppet-b7c7feee5370eb25d0c8fab484c54c9e3e4ab6c2.tar.gz
puppet-b7c7feee5370eb25d0c8fab484c54c9e3e4ab6c2.tar.bz2
puppet-b7c7feee5370eb25d0c8fab484c54c9e3e4ab6c2.tar.xz
puppet-b7c7feee5370eb25d0c8fab484c54c9e3e4ab6c2.zip
send upload notifications to packages-commits ML
Diffstat (limited to 'modules')
-rw-r--r--modules/buildsystem/manifests/init.pp2
-rwxr-xr-xmodules/buildsystem/templates/upload-bin4
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index cb228719..1d55040e 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -223,6 +223,8 @@ class buildsystem {
$uploadinfosdir = "$binrepo_homedir/infos"
$uploadbinpath = '/usr/local/bin/upload-bin'
$uploadbinpathwrapper = '/usr/local/bin/wrapper.upload-bin'
+ $uploadmail_from = "root@$domain"
+ $uploadmail_to = "packages-commits@ml.$domain"
user {"$binrepo_login":
ensure => present,
diff --git a/modules/buildsystem/templates/upload-bin b/modules/buildsystem/templates/upload-bin
index 4f02d002..ef64a1a3 100755
--- a/modules/buildsystem/templates/upload-bin
+++ b/modules/buildsystem/templates/upload-bin
@@ -2,8 +2,8 @@
binrepodir=<%= binrepodir %>
uploadinfosdir=<%= uploadinfosdir %>
tmpfile=$(mktemp)
-mail_from="root@mageia.org"
-mail_dest="boklm@mars-attacks.org"
+mail_from="<%= uploadmail_from %>"
+mail_dest="<%= uploadmail_to %>"
test $# = 2 || exit 3
username="$1"