Send email when system is approved

diff --git a/scripts/approve_system.pl b/scripts/approve_system.pl
index 9a7457d8b633b604be287a8ca336374309b7267c..32e23218215ac67b402c5c722c9639315c6b78a0 100755 (executable)
--- a/scripts/approve_system.pl
+++ b/scripts/approve_system.pl
@@ -3,12 +3,14 @@
 use strict;
 use warnings;
 use DBI;
+use Mail::Send;
 use Data::Dumper;
 
 die "Must pass current sysname and new sysname\n" unless scalar @ARGV == 2;
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport
             $user_list_format
+            $default_host $mail_from
 );
 require "$ENV{BFConfDir}/BuildFarmWeb.pl";
 
@@ -26,12 +28,46 @@ die $DBI::errstr unless $db;
 $db->do('SELECT approve(?, ?)', undef, @ARGV);
 
 my $sth = $db->prepare(q[ 
-       SELECT name, status, operating_system, os_version, sys_owner, owner_email
+       SELECT name, status, operating_system, os_version, sys_owner, owner_email,
+              secret, compiler, compiler_version, architecture
        FROM buildsystems AS b
        ORDER BY name ASC
       ]);
 $sth->execute();
 
+sub send_welcome_message
+{
+  my $row = shift() or return;
+  my $msg = new Mail::Send;
+  my $me = `id -un`; chomp($me);
+  my $host = `hostname`; chomp($host);
+  $host = $default_host unless ($host =~ m/[.]/ || !defined($default_host));
+  my $from_addr = $mail_from ?
+                  "Exim BuildFarm <$mail_from>" :
+                  "Exim BuildFarm <$me\@$host>" ;
+  $from_addr =~ tr /\r\n//d;
+  $msg->set('From',$from_addr);
+  $msg->to($row->{owner_email});
+  $msg->subject('Exim BuildFarm Application Approved');
+  my $fh = $msg->open;
+  print $fh "\n\nCongratulations $row->{sys_owner},\n",
+            "Your application for the Exim BuildFarm has been accepted.\n\n",
+            "Please set the following in your build-farm.conf:\n",
+            "Animal:  $row->{name}\n",
+            "Secret:  $row->{secret}\n\n",
+            "BuildFarm machine details:\n",
+            "Distro  : $row->{operating_system}\n",
+            "+Version: $row->{os_version}\n",
+            "Arch    : $row->{architecture}\n",
+            "Compiler: $row->{compiler}\n",
+            "+Version: $row->{compiler_version}\n\n",
+            "If you update your system, either the Distro or compiler version\n",
+            "you can use the update_personality.pl script to update the\n",
+            "version stored in the BuildFarm database.\n\n",
+            "-- The Exim BuildFarm Maintainers";
+  $fh->close;
+}
+
 printf $user_list_format,
        "SysName", "Status", "Owner", "Email", "Distro", "Version";
 while (my $row = $sth->fetchrow_hashref)
@@ -40,5 +76,10 @@ while (my $row = $sth->fetchrow_hashref)
                   $row->{name}, $row->{status}, $row->{sys_owner},
                   $row->{owner_email}, $row->{operating_system},
                   $row->{os_version};
+  if ($row->{name} eq $ARGV[1])
+  {
+    &send_welcome_email($row);
+  }
 }
 $db->disconnect();
+

diff --git a/scripts/rename_system.pl b/scripts/rename_system.pl
index cf1dbde55d6c72a912e09597b13b88a7547b91b1..9e320cb8c25295872fbae60b34a8b6db723aec01 100755 (executable)
--- a/scripts/rename_system.pl
+++ b/scripts/rename_system.pl
@@ -37,7 +37,6 @@ my $sth = $db->prepare(q[
       ]);
 $sth->execute();
 
-my $user_list_format = "%-10s %-10s %-18s %-20s %-18s %-s\n";
 printf $user_list_format,
        "SysName", "Status", "Owner", "Email", "Distro", "Version";
 while (my $row = $sth->fetchrow_hashref)