From 577b17580712cc9fd4fd1dedec32999c67aecf89 Mon Sep 17 00:00:00 2001
From: wanna-build admin <wbadm@raff.debian.org>
Date: Sun, 23 Nov 2008 15:44:46 +0000
Subject: [PATCH] introduce a buildd mail domain [pkern]
---
bin/wanna-build | 13 +++++--------
etc/wanna-build.conf.local | 3 +++
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bin/wanna-build b/bin/wanna-build
index 7b9c4ea..44f3743 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -45,9 +45,9 @@ our ($verbose, $mail_logs, $list_order, $list_state,
$curr_date, $op_mode, $user, $real_user, $distribution,
$fail_reason, $opt_override, $import_from, $export_to, $opt_create_db,
$transactlog, %db, %otherdb, %otherdb_lock, %prioval, %sectval,
- $info_all_dists, $hostname, $arch,
+ $info_all_dists, $arch,
$category, %catval, %short_category,
- $short_date, $list_min_age, $dbbase, $host_set, @curr_time,
+ $short_date, $list_min_age, $dbbase, @curr_time,
$build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc);
# global vars
@@ -2177,14 +2177,11 @@ sub send_mail {
my $text = shift;
my $from = $conf::db_maint;
+ my $domain = $conf::buildd_domain;
- if ($host_set != 1) {
- chomp( $hostname = `/bin/hostname -f` );
- $host_set = 1;
- }
- $from .= "\@$hostname" if $from !~ /\@/;
+ $from .= "\@$domain" if $from !~ /\@/;
- $to .= '@' . $hostname if $to !~ /\@/;
+ $to .= '@' . $domain if $to !~ /\@/;
$text =~ s/^\.$/../mg;
local $SIG{'PIPE'} = 'IGNORE';
open( PIPE, "| $conf::mailprog -oem $to" )
diff --git a/etc/wanna-build.conf.local b/etc/wanna-build.conf.local
index 95d4efb..febf5ec 100644
--- a/etc/wanna-build.conf.local
+++ b/etc/wanna-build.conf.local
@@ -24,6 +24,9 @@ $notforus_maint = "rmurray-wanna-build";
# where to send wanna-build statistics mails
$stat_mail = "wb-team\@buildd.debian.org";
+# mail domain under which the buildds can be reached
+$buildd_domain = "buildd.debian.org";
+
# file to publish statistics over WWW (optional)
#$web_stats = "/var/www/buildd/stats.txt";
--
2.39.5