From b9c41d8557238553e4e075245539e49aea91fe43 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <danf@mageia.org>
Date: Thu, 8 Feb 2024 21:03:00 -0800
Subject: Send Bugzilla e-mails from bugzilla_noreply@ml.mageia.org

This is currently the only subdomain with an SPF record and is therefore
the only one from which some mail providers will accept e-mails these
days. Having _noreply in the name makes it more obvious that a reply
will go nowhere.
---
 deployment/lists/manifests/init.pp     | 16 ++++++++--------
 modules/bugzilla/templates/params      |  2 +-
 modules/bugzilla/templates/params.json |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/deployment/lists/manifests/init.pp b/deployment/lists/manifests/init.pp
index 8efb62c6..0b8307c6 100755
--- a/deployment/lists/manifests/init.pp
+++ b/deployment/lists/manifests/init.pp
@@ -11,7 +11,7 @@ class lists {
     sympa::list::announce {'atelier-bugs':
         subject      => 'Atelier bug reports from bugzilla',
         reply_to     => "atelier-discuss@ml.${::domain}",
-        sender_email => [ "bugzilla-daemon@${::domain}" ],
+        sender_email => [ "bugzilla_noreply@ml.${::domain}" ],
         topics       => 'atelier',
     }
 
@@ -67,7 +67,7 @@ class lists {
     sympa::list::announce { 'i18n-bugs':
         subject      => 'Translation bug reports from bugzilla',
         reply_to     => "i18n-discuss@ml.${::domain}",
-        sender_email => [ "bugzilla-daemon@${::domain}" ],
+        sender_email => [ "bugzilla_noreply@ml.${::domain}" ],
         topics       => 'i18n',
     }
 
@@ -222,7 +222,7 @@ class lists {
     sympa::list::announce {'qa-bugs':
         subject      => 'QA bug reports from bugzilla',
         reply_to     => "qa-discuss@ml.${::domain}",
-        sender_email => [ "bugzilla-daemon@${::domain}" ],
+        sender_email => [ "bugzilla_noreply@ml.${::domain}" ],
         topics       => 'qa',
     }
 
@@ -248,7 +248,7 @@ class lists {
     sympa::list::announce {'forums-bugs':
         subject      => 'Forums bug reports from bugzilla',
         reply_to     => "forums-discuss@ml.${::domain}",
-        sender_email => [ "bugzilla-daemon@${::domain}" ],
+        sender_email => [ "bugzilla_noreply@ml.${::domain}" ],
         topics       => 'forums',
     }
 
@@ -260,7 +260,7 @@ class lists {
     sympa::list::announce { 'doc-bugs':
         subject      => 'Documentation bug reports from bugzilla',
         reply_to     => "doc-discuss@ml.${::domain}",
-        sender_email => [ "bugzilla-daemon@${::domain}" ],
+        sender_email => [ "bugzilla_noreply@ml.${::domain}" ],
         topics       => 'doc',
     }
 
@@ -300,7 +300,7 @@ class lists {
     sympa::list::announce { 'sysadmin-bugs':
         subject      => 'Sysadmin bug reports from bugzilla',
         reply_to     => "sysadmin-discuss@ml.${::domain}",
-        sender_email => [ "bugzilla-daemon@${::domain}" ],
+        sender_email => [ "bugzilla_noreply@ml.${::domain}" ],
         topics       => 'sysadmin',
     }
 
@@ -314,14 +314,14 @@ class lists {
     sympa::list::announce { 'bugs':
         subject      => 'Bug reports from bugzilla',
         reply_to     => "dev@ml.${::domain}",
-        sender_email => [ "bugzilla-daemon@${::domain}" ],
+        sender_email => [ "bugzilla_noreply@ml.${::domain}" ],
         topics       => 'developers',
     }
 
     sympa::list::announce { 'pkg-bugs':
         subject      => 'Packaging bug reports from bugzilla',
         reply_to     => "dev@ml.${::domain}",
-        sender_email => [ "bugzilla-daemon@${::domain}" ],
+        sender_email => [ "bugzilla_noreply@ml.${::domain}" ],
         topics       => 'developers',
     }
 
diff --git a/modules/bugzilla/templates/params b/modules/bugzilla/templates/params
index 64e6d6d2..2e71a39d 100644
--- a/modules/bugzilla/templates/params
+++ b/modules/bugzilla/templates/params
@@ -53,7 +53,7 @@
            'lxr_root' => '',
            'lxr_url' => '',
            'mail_delivery_method' => 'SMTP',
-           'mailfrom' => 'bugzilla-daemon@<%= domain %>',
+           'mailfrom' => 'bugzilla_noreply@ml.<%= domain %>',
            'maintainer' => 'sysadmin@group.<%= domain %>',
            'makeproductgroups' => 0,
            'maxattachmentsize' => '1000',
diff --git a/modules/bugzilla/templates/params.json b/modules/bugzilla/templates/params.json
index 79ec8c66..05325bc7 100644
--- a/modules/bugzilla/templates/params.json
+++ b/modules/bugzilla/templates/params.json
@@ -49,7 +49,7 @@
    "letsubmitterchoosemilestone" : "1",
    "letsubmitterchoosepriority" : "1",
    "mail_delivery_method" : "SMTP",
-   "mailfrom" : "bugzilla-daemon@<%= domain %>",
+   "mailfrom" : "bugzilla_noreply@ml.<%= domain %>",
    "maintainer" : "sysadmin@group.<%= domain %>",
    "makeproductgroups" : "0",
    "max_search_results" : "10000",
-- 
cgit v1.2.1