Fix backports-announce so mga-qa-committers members can send (mga#32929)

2 files changed, 9 insertions, 5 deletions

diff --git a/deployment/lists/manifests/init.pp b/deployment/lists/manifests/init.pp
index 00efc29d..ea26557e 100755
--- a/deployment/lists/manifests/init.pp
+++ b/deployment/lists/manifests/init.pp
@@ -2,8 +2,10 @@ class lists {
     # When adding a new list, also add it to the wiki page :
     # https://wiki.mageia.org/en/Mailing_lists
 
-    # Note: a sender_email of "FOO@group.${::domain}" corresponds to the members of the
-    # LDAP group mga-FOO
+    # Note: an e-mail of "FOO@group.${::domain}" corresponds to LDAP group
+    # mga-FOO, but only for a user sending from that group; the members are
+    # not expanded. subscriber_ldap_group and sender_ldap_group are expanded to
+    # their group members.
 
     sympa::list::announce { 'announce':
         subject      => 'Mageia announces',
@@ -340,7 +342,7 @@ class lists {
     sympa::list::announce { 'backports-announce':
         subject      => 'Package backports for stable release',
         reply_to     => "dev@ml.${::domain}",
-        sender_email => [ "qa-committers@group.${::domain}", "buildsystem-daemon@${::domain}" ],
+        sender_ldap_group => "mga-qa-committers",
         topics       => 'developers',
     }
 
diff --git a/modules/sympa/manifests/list/announce.pp b/modules/sympa/manifests/list/announce.pp
index c60da20b..05445ff5 100644
--- a/modules/sympa/manifests/list/announce.pp
+++ b/modules/sympa/manifests/list/announce.pp
@@ -1,8 +1,9 @@
-# list where announce are sent by $email only
+# list where announce are sent by $email or $ldap_group only
 # reply_to is set to $reply_to
 define sympa::list::announce($subject,
                                   $reply_to,
-                                  $sender_email,
+                                  $sender_email = false,
+                                  $sender_ldap_group = false,
                                   $subscriber_ldap_group = false,
                                   $language = 'en',
                                   $topics = false) {
@@ -12,6 +13,7 @@ define sympa::list::announce($subject,
         topics                => $topics,
         reply_to              => $reply_to,
         sender_email          => $sender_email,
+        sender_ldap_group     => $sender_ldap_group,
         subscriber_ldap_group => $subscriber_ldap_group,
     }
 }