Fix message IDs and Herald URIs.

conf/default.conf.php

@@ -124,6 +124,9 @@ return array(
   // Default address to send mail "From".
   'metamta.default-address'     => 'noreply@example.com',
 
+  // Domain used to generate Message-IDs.
+  'metamta.domain'              => 'example.com',
+
   // When a user takes an action which generates an email notification (like
   // commenting on a Differential revision), Phabricator can either send that
   // mail "From" the user's email address (like "alincoln@logcabin.com") or

src/applications/differential/mail/base/DifferentialMail.php

@@ -133,10 +133,13 @@ EOTEXT;
 */
 
     if ($this->getHeraldTranscriptURI() && $this->isFirstMailToRecipients()) {
+      $manage_uri = PhabricatorEnv::getProductionURI(
+        '/herald/view/differential/');
+
       $xscript_uri = $this->getHeraldTranscriptURI();
       $body .= <<<EOTEXT
 
-MANAGE HERALD RULES
+MANAGE HERALD DIFFERENTIAL RULES
   http://todo.com/herald/
 
 WHY DID I GET THIS EMAIL?
@@ -217,8 +220,8 @@ EOTEXT;
 
   protected function getMessageID() {
     $phid = $this->getRevision()->getPHID();
-    // TODO
-    return "<differential-rev-{$phid}-req@TODO.com>";
+    $domain = PhabricatorEnv::getEnvConfig('metamta.domain');
+    return "<differential-rev-{$phid}-req@{$domain}>";
   }
 
   public function setComment($comment) {

src/applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php

@@ -112,7 +112,7 @@ DIFFERENTIAL REVISION
 AFFECTED FILES
   {$files}
 
-MANAGE HERALD RULES
+MANAGE HERALD COMMIT RULES
   {$manage_uri}
 
 WHY DID I GET THIS EMAIL?