diff options
| -rw-r--r-- | modules/buildsystem/manifests/init.pp | 2 | ||||
| -rwxr-xr-x | modules/buildsystem/templates/upload-bin | 4 |
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" |