Gemfile.lock

@@ -121,7 +121,7 @@ GEM
       activerecord
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
-    loofah (2.2.0)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -165,8 +165,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     railties (5.1.5)
       actionpack (= 5.1.5)
       activesupport (= 5.1.5)
@@ -283,4 +283,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 BUNDLED WITH
-   1.16.0
+   1.16.1

app/views/http_endpoints/_form.html.haml

@@ -30,9 +30,9 @@
     .fieldSet__field
       = f.label :strip_replies, :class => 'fieldSet__label'
       .fieldSet__input
-        = f.select :strip_replies, [["Send the full message as received", false], ["Try to seperate replies/signatures from plain body", true]], {}, :class => 'input input--select'
+        = f.select :strip_replies, [["Send the full message as received", false], ["Try to separate replies/signatures from plain body", true]], {}, :class => 'input input--select'
         %p.fieldSet__text
-          If enabled, we'll try to remove the replies/signatures from the plain body and send them seperately to the rest of the body.
+          If enabled, we'll try to remove the replies/signatures from the plain body and send them separately to the rest of the body.
           This is useful if you just want to see the latest message in a thread.
     .fieldSet__field
       = f.label :include_attachments, "Attachments", :class => 'fieldSet__label'

app/views/track_domains/_form.html.haml

@@ -17,7 +17,7 @@
       .fieldSet__input
         = f.select :ssl_enabled, [["Yes - use SSL for tracking whenever possible", true], ["No - never use SSL for tracking", false]], {}, :class => 'input input--select'
         %p.fieldSet__text
-          If enabled, we'll try to remove the replies/signatures from the plain body and send them seperately to the rest of the body.
+          If enabled, we'll try to remove the replies/signatures from the plain body and send them separately to the rest of the body.
           This is useful if you just want to see the latest message in a thread.
     .fieldSet__field

config/postal.defaults.yml

@@ -21,7 +21,12 @@ web_server:
 fast_server:
   enabled: false
-  bind_address: 0.0.0.0
+  bind_address:
+    # Set appropriate IP addresses to listen on. These should be dedicated IP
+    # addresses just used for this server. You should list IPv4 and IPv6 addresses
+    # as appropriate.
+    # - 1.2.3.4
+    # - abcd:a:b:c:d::1
   port: 80
   ssl_port: 443
   proxy_protocol: false

script/queue_size.rb

@@ -3,5 +3,5 @@ require_relative '../lib/postal/config'
 require 'mysql2'
 client = Mysql2::Client.new(:host => Postal.config.main_db.host, :username => Postal.config.main_db.username, :password => Postal.config.main_db.password, :port => Postal.config.main_db.port, :database => Postal.config.main_db.database)
-result = client.query("SELECT COUNT(id) as size FROM `queued_messages` WHERE retry_after IS NULL OR retry_after <= ADDTIME(UTC_TIMESTAMP(), '30')")
+result = client.query("SELECT COUNT(id) as size FROM `queued_messages` WHERE retry_after IS NULL OR retry_after <= ADDTIME(UTC_TIMESTAMP(), '30') AND locked_at IS NULL")
 puts result.to_a.first['size']

script/update_process_concurrency.rb

@@ -3,6 +3,8 @@
 require File.expand_path('../../lib/postal/config', __FILE__)
 worker_quantity = Postal.config.workers&.quantity || 1
 hash = {
+  'root' => Postal.app_root.to_s,
+  'user' => ENV['USER'],
   'processes' => {
     'worker' => {
       'quantity' => worker_quantity