aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Fandrich <danf@mageia.org>2024-02-12 23:38:26 -0800
committerDan Fandrich <danf@mageia.org>2024-02-12 23:38:26 -0800
commitf3f49a26f2f820c9041345c3001a136de289d8f7 (patch)
treefce42b6e3960ea887181a9f506b9987e55b7c1a0
parent1dcb5d027b9dda13ff5740e0be1a0dc86f97d8c7 (diff)
downloadpuppet-f3f49a26.tar
puppet-f3f49a26.tar.gz
puppet-f3f49a26.tar.bz2
puppet-f3f49a26.tar.xz
puppet-f3f49a26.zip
Send packages-commits e-mails from new addresses
These mails should be delivered more reliably because this domain has an SPF record.
-rwxr-xr-xdeployment/lists/manifests/init.pp2
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp2
-rw-r--r--modules/subversion/templates/hook_sendmail.pl4
3 files changed, 4 insertions, 4 deletions
diff --git a/deployment/lists/manifests/init.pp b/deployment/lists/manifests/init.pp
index 0b8307c6..6b151ec4 100755
--- a/deployment/lists/manifests/init.pp
+++ b/deployment/lists/manifests/init.pp
@@ -267,7 +267,7 @@ class lists {
sympa::list::announce { 'packages-commits':
subject => 'Commits on packages repository',
reply_to => "dev@ml.${::domain}",
- sender_email => [ "root@${::domain}" ],
+ sender_email => [ "subversion_noreply@ml.${::domain}", "binrepo_noreply@ml.${::domain}" ],
topics => 'developers',
}
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 3b7306d1..7683c3c7 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -63,7 +63,7 @@ class mga_buildsystem::config {
}
include buildsystem::var::repository
class { 'buildsystem::var::binrepo':
- uploadmail_from => "root@${::domain}",
+ uploadmail_from => "binrepo_noreply@ml.${::domain}",
uploadmail_to => "packages-commits@ml.${::domain}",
}
diff --git a/modules/subversion/templates/hook_sendmail.pl b/modules/subversion/templates/hook_sendmail.pl
index 8572070f..7277e330 100644
--- a/modules/subversion/templates/hook_sendmail.pl
+++ b/modules/subversion/templates/hook_sendmail.pl
@@ -10,7 +10,7 @@
ticket_map: "\bmga#(\d+)\b=https://bugs.mageia.org/show_bug.cgi?id=%s"
revision-url: "https://svnweb.mageia.org/packages/?revision=%s&view=revision"
subject_cx: 1
- from: root@<%= @domain %>
+ from: subversion_noreply@ml.<%= @domain %>
to:
<%- commit_mail.each do |mail| -%>
- <%= mail %>
@@ -25,6 +25,6 @@
ticket_map: "\bmga#(\d+)\b=https://bugs.mageia.org/show_bug.cgi?id=%s"
revision-url: "https://svnweb.mageia.org/packages/?revision=%s&view=revision"
subject_cx: 1
- from: root@<%= @domain %>
+ from: subversion_noreply@ml.<%= @domain %>
to: <%= i18n_mail %>
<%- end -%>