Skip to content

Commit a9e7d78

Browse files
authored
Merge pull request #660 from code-corps/659-add-postmark-adapter
Add Postmark adapter for Bamboo emails
2 parents ebb66ad + 11045d7 commit a9e7d78

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export AWS_ACCESS_KEY_ID=
22
export AWS_SECRET_ACCESS_KEY=
33
export CLOUDFRONT_DOMAIN=
4+
export POSTMARK_API_KEY=
45
export S3_BUCKET=
56
export SEGMENT_WRITE_KEY=
67
export SENTRY_DSN=

config/prod.exs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ config :sentry,
5555

5656
# TODO: Replace with actual adapter
5757
config :code_corps, CodeCorps.Mailer,
58-
adapter: Bamboo.LocalAdapter
58+
adapter: Bamboo.PostmarkAdapter,
59+
api_key: System.get_env("POSTMARK_API_KEY")
5960

6061
# ## SSL Support
6162
#

config/staging.exs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ config :code_corps, :stripe, Stripe
5353
config :code_corps, :stripe_env, :staging
5454

5555
config :code_corps, CodeCorps.Mailer,
56-
adapter: Bamboo.LocalAdapter
56+
adapter: Bamboo.PostmarkAdapter,
57+
api_key: System.get_env("POSTMARK_API_KEY")
5758

5859
# ## SSL Support
5960
#

mix.exs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ defmodule CodeCorps.Mixfile do
5858
defp deps do
5959
[
6060
{:bamboo, "~> 0.7"}, # emails
61+
{:bamboo_postmark, "~> 0.2.0"}, # postmark adapter for emails
6162
{:phoenix, "~> 1.2.1"},
6263
{:phoenix_pubsub, "~> 1.0"},
6364
{:phoenix_ecto, "~> 3.0"},

mix.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
%{"arc": {:hex, :arc, "0.6.0", "f4ef95b4e72ec5bce8db3474245e8202938b45e431adb34b20a8cda18d98373b", [:mix], [{:ex_aws, "~> 1.0.0", [hex: :ex_aws, optional: true]}, {:httpoison, "~> 0.8", [hex: :httpoison, optional: false]}, {:poison, "~> 2.0 or ~> 3.0", [hex: :poison, optional: true]}, {:sweet_xml, "~> 0.5", [hex: :sweet_xml, optional: true]}]},
22
"arc_ecto": {:hex, :arc_ecto, "0.5.0", "ae5369e3c9a956bd7eacf1d8e2163970cfc2cf6c2e9ce79eeef91888e6f6a05e", [:mix], [{:arc, "~> 0.6.0", [hex: :arc, optional: false]}, {:ecto, "~> 2.0", [hex: :ecto, optional: false]}]},
33
"bamboo": {:hex, :bamboo, "0.8.0", "573889a3efcb906bb9d25a1c4caa4ca22f479235e1b8cc3260d8b88dabeb4b14", [:mix], [{:hackney, "~> 1.6", [hex: :hackney, optional: false]}, {:plug, "~> 1.0", [hex: :plug, optional: false]}, {:poison, ">= 1.5.0", [hex: :poison, optional: false]}]},
4+
"bamboo_postmark": {:hex, :bamboo_postmark, "0.2.0", "9c51d09b4e619559d5a98054a603ed6f1157f5ba59847b9748ecbb49896e16fc", [:mix], [{:bamboo, "~> 0.5", [hex: :bamboo, optional: false]}, {:hackney, "~> 1.6", [hex: :hackney, optional: false]}, {:plug, "~> 1.0", [hex: :plug, optional: false]}, {:poison, ">= 1.5.0", [hex: :poison, optional: false]}]},
45
"base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], []},
56
"benchfella": {:hex, :benchfella, "0.3.3", "bbde48b5fe1ef556baa7ad933008e214e050e81ddb0916350715f5759fb35c0c", [:mix], []},
67
"bunt": {:hex, :bunt, "0.1.6", "5d95a6882f73f3b9969fdfd1953798046664e6f77ec4e486e6fafc7caad97c6f", [:mix], []},

priv/repo/structure.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
-- PostgreSQL database dump
33
--
44

5-
-- Dumped from database version 9.5.4
6-
-- Dumped by pg_dump version 9.5.4
5+
-- Dumped from database version 9.5.1
6+
-- Dumped by pg_dump version 9.5.1
77

88
SET statement_timeout = 0;
99
SET lock_timeout = 0;

0 commit comments

Comments
 (0)