PAUSE::Config: replace UPLOAD with NOREPLY_ADDRESS

Author: rjbs

lib/PAUSE.pm

@@ -104,6 +104,7 @@ $PAUSE::Config ||=
      ML_MIN_FILES => 20_000, # must be this many files to run mldistwatch
      MOD_DATA_SOURCE_NAME => "dbi:mysql:mod",
      NO_SUCCESS_BREAK => 900,
+     NOREPLY_ADDRESS => '[email protected]',
      P5P => '[email protected]',
      PID_DIR => "/home/pause/pid/",
      PAUSE_LOG => "/home/pause/log/paused.log",
@@ -119,7 +120,6 @@ $PAUSE::Config ||=
      TIMEOUT => 60*60,
      TRUST_IS_SSL_HEADER => 1,
      TMP => '/data/pause/tmp/',
-     UPLOAD => '[email protected]',
      # sign the auto-generated CHECKSUM files with:
      CHECKSUMS_SIGNING_PROGRAM => 'gpg',
      CHECKSUMS_SIGNING_ARGS => '-q --homedir /home/pause/pause-private/gnupg-pause-batch-signing-home --clearsign --default-key ',

lib/PAUSE/Email.pm

@@ -24,7 +24,7 @@ sub fromaddr_email_header_object ($class) {
   require PAUSE;
 
   return $class->email_header_object_for_addresses(
-    Email::Address::XS->new("Perl Authors Upload Server", $PAUSE::Config->{UPLOAD})
+    Email::Address::XS->new("Perl Authors Upload Server", $PAUSE::Config->{NOREPLY_ADDRESS})
   );
 }
 

lib/pause_1999/config.pm

@@ -394,7 +394,7 @@ share_perms
 
   }
 
-  $self->{OurEmailFrom} = "\"Perl Authors Upload Server\" <$PAUSE::Config->{UPLOAD}>";
+  $self->{OurEmailFrom} = "\"Perl Authors Upload Server\" <$PAUSE::Config->{NOREPLY_ADDRESS}>";
   # warn "Debug: OurEmailFrom=UPLOAD[$self->{OurEmailFrom}]";
   my(@time) = gmtime; # sec,min,hour,day,month,year
   my $quartal = int($time[4]/3) + 1; # 1..4

lib/pause_1999/edit.pm

@@ -1654,7 +1654,7 @@ filename[%s]. </p>
 
   # via FTP GET
 
-  warn "DEBUG: UPLOAD[$PAUSE::Config->{UPLOAD}]";
+  warn "DEBUG: UPLOAD[$PAUSE::Config->{NOREPLY_ADDRESS}]";
   push @m, qq{<tr><td bgcolor="#ffe0ff">If you want me <b>to fetch a
       file</b> from an URL, enter the full URL here.<br />};
 
@@ -2457,12 +2457,12 @@ The PAUSE Team
 
     # both users and mailing lists run this code
 
-    warn "DEBUG: UPLOAD[$PAUSE::Config->{UPLOAD}]";
+    warn "DEBUG: UPLOAD[$PAUSE::Config->{NOREPLY_ADDRESS}]";
     my(@to) = $PAUSE::Config->{CONTACT_ADDRESS};
     push @m, qq{ Sending separate mails to:
 }, join(" AND ", @to, $email), qq{
 <pre>
-From: $PAUSE::Config->{UPLOAD}
+From: $PAUSE::Config->{NOREPLY_ADDRESS}
 Subject: $subject\n};
 
     my($blurb) = join "", @blurb;
@@ -3065,7 +3065,7 @@ MAIL
                    }{<a href=\"$1\">$1</a>}xg;
     $blurbcopy =~ s|(>http.*?)U|$1\n    U|gs; # break the long URL
     push @m, qq{<pre>
-From: $PAUSE::Config->{UPLOAD}
+From: $PAUSE::Config->{NOREPLY_ADDRESS}
 Subject: $subject
 
 $blurbcopy
@@ -4394,9 +4394,9 @@ The PAUSE Team
     my($blurb) = join "", @blurb;
     require HTML::Entities;
     my($blurbcopy) = HTML::Entities::encode($blurb,"<>&");
-    warn "DEBUG: UPLOAD[$PAUSE::Config->{UPLOAD}]";
+    warn "DEBUG: UPLOAD[$PAUSE::Config->{NOREPLY_ADDRESS}]";
     push @m, qq{<pre>
-From: $PAUSE::Config->{UPLOAD}
+From: $PAUSE::Config->{NOREPLY_ADDRESS}
 Subject: $subject
 
 $blurbcopy
@@ -4967,9 +4967,9 @@ Peek at the current permissions:
     my($blurbcopy) = HTML::Entities::encode($blurb,"<>&");
     $blurbcopy =~ s|(https?://[^\s\"]+)|<a href="$1">$1</a>|g;
     $blurbcopy =~ s|(>http.*?)U|$1\n    U|gs; # break the long URL
-    # warn "DEBUG: UPLOAD[$PAUSE::Config->{UPLOAD}]";
+    # warn "DEBUG: UPLOAD[$PAUSE::Config->{NOREPLY_ADDRESS}]";
     push @m, qq{<pre>
-From: $PAUSE::Config->{UPLOAD}
+From: $PAUSE::Config->{NOREPLY_ADDRESS}
 Subject: $subject
 
 $blurbcopy
@@ -5951,7 +5951,7 @@ decision.</li>
     again. As it is done by a cron job, it may take up to an hour
     until the indexer actually executes the command. If this doesn't
     repair the index, please <a
-    href="mailto:$PAUSE::Config->{UPLOAD}">email me</a>. };
+    href="mailto:$PAUSE::Config->{NOREPLY_ADDRESS}">email me</a>. };
 
   require Cwd;
   my $cwd = Cwd::cwd();

lib/pause_2017/PAUSE/Web/Controller/User/Uri.pm

@@ -136,7 +136,7 @@ sub add {
 
   # via FTP GET
 
-  warn "DEBUG: UPLOAD[$PAUSE::Config->{UPLOAD}]";
+  warn "DEBUG: UPLOAD[$PAUSE::Config->{NOREPLY_ADDRESS}]";
 
   # END OF UPLOAD OPTIONS
 }

lib/pause_2017/templates/admin/user/add.html.ep

@@ -87,7 +87,7 @@ changed&#160;by&#160;<%= $row->{changedby} %><br>
 
 Sending separate mails to: <%= $pause->{send_to} %>
 <pre>
-From: <%= $PAUSE::Config->{UPLOAD} %>
+From: <%= $PAUSE::Config->{NOREPLY_ADDRESS} %>
 Subject: <%= $pause->{subject} %>
 
 <%= $pause->{blurb} %>

lib/pause_2017/templates/public/request_id/request.html.ep

@@ -24,7 +24,7 @@
 <p>You'll also receive a welcome email like the one below.</p>
 
 <pre class="email_sent">
-From: <%= $PAUSE::Config->{UPLOAD} %>
+From: <%= $PAUSE::Config->{NOREPLY_ADDRESS} %>
 Subject: <%= $pause->{subject_for_user_addition} %>
 
 <%== $pause->{blurb_for_user_addition} %>
@@ -37,7 +37,7 @@ Subject: <%= $pause->{subject_for_user_addition} %>
 %   elsif ($pause->{blurbcopy}) {
 Sending mail to: <%= $pause->{send_to} %>
 <pre class="email_sent">
-From: <%= $PAUSE::Config->{UPLOAD} %>
+From: <%= $PAUSE::Config->{NOREPLY_ADDRESS} %>
 Subject: <%= $pause->{subject} %>
 
 <%== $pause->{blurbcopy} %>

lib/pause_2017/templates/user/reindex.html.ep

@@ -14,7 +14,7 @@
 
 </ul>
 
-<p>With this form you can tell the indexer to index selected files again. As it is done by a cron job, it may take up to an hour until the indexer actually executes the command. If this doesn't repair the index, please <a href="mailto:<%= $PAUSE::Config->{UPLOAD} %>">email me</a>.</p>
+<p>With this form you can tell the indexer to index selected files again. As it is done by a cron job, it may take up to an hour until the indexer actually executes the command. If this doesn't repair the index, please <a href="mailto:<%= $PAUSE::Config->{NOREPLY_ADDRESS} %>">email me</a>.</p>
 
 % if (%$files) {
 %   if ($pause->{mailbody}) {

t/pause_2017/lib/Test/PAUSE/Web.pm

@@ -51,8 +51,8 @@ $PAUSE::Config->{ML_CHOWN_USER} = 'ishigaki';
 $PAUSE::Config->{ML_CHOWN_GROUP} = 'ishigaki';
 $PAUSE::Config->{ML_MIN_INDEX_LINES} = 0;
 $PAUSE::Config->{ML_MIN_FILES} = 0;
+$PAUSE::Config->{NOREPLY_ADDRESS} = $TestEmail;
 $PAUSE::Config->{RUNDATA} = "$TestRoot/rundata";
-$PAUSE::Config->{UPLOAD} = $TestEmail;
 $PAUSE::Config->{HAVE_PERLBAL} = 0;
 $PAUSE::Config->{SLEEP} = 1;
 $PAUSE::Config->{INCOMING} = "file://$TestRoot/incoming/";