From cc4f617b669c2cc343d9ac9ab6cf93014bf9fa82 Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 18 Dec 2024 21:27:50 +0530 Subject: [PATCH 1/4] Switch MAILER_SMTP_FROM_EMAIL and MAILER_SMTP_USER defaults --- config/runtime.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/runtime.exs b/config/runtime.exs index 2e53e4c..f5a2fca 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -74,8 +74,8 @@ if config_env() == :prod do case mailer_type do "smtp" -> host = System.fetch_env!("MAILER_SMTP_HOST") - user = System.fetch_env!("MAILER_SMTP_USER") - from_email = System.get_env("MAILER_SMTP_FROM_EMAIL") || user + from_email = System.fetch_env!("MAILER_SMTP_FROM_EMAIL") + user = System.get_env("MAILER_SMTP_USER") || from_email password = System.fetch_env!("MAILER_SMTP_PASSWORD") port = System.get_env("MAILER_SMTP_PORT", "587") |> maybe_to_int.() ssl? = System.get_env("MAILER_ENABLE_SSL", "FALSE") in [1, "1", "true", "TRUE"] From 19280f1af4acf90ef119257ec3a8b6d07149153d Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 18 Dec 2024 21:36:20 +0530 Subject: [PATCH 2/4] Sign CLA --- .cla/contributors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.cla/contributors.txt b/.cla/contributors.txt index 2f65a2e..7f78295 100644 --- a/.cla/contributors.txt +++ b/.cla/contributors.txt @@ -1 +1,2 @@ Drxv52be4bkwIk4djnqQl/PfJXwnwP2C5I5BMFEi5ikLMPzAjdz80oqEwZ7hw62BmnUtBiX57rg3nLuaCDJ2DIX4VXkUJWtFRUpDdSclJNa0O4Ts26s3fCaIHfpRO4cqtd5Pco1qyns/L0gjD2EEF2h5m1Qu7k/PRrR1XAFuJw5P6O2UIKTVoeKegw5NQirDAS9g4v8a9PLbSA4ias5Bu12Zx9hqm9Q9UMYNBFtOlmcGWKKMV5WmvT3+22VqHuLTIiOPbhZ6xIowJ6v+gxrQWWI43dW2A0jDvMpqlH4q/GscALjAlpWX4fOwO/Xp9rGF0rNgeUPOPRDd3uVY0v5lFpC6ddrhlrYo1JfecFaHwx/NGPLKvIw1vJe9D6DCzdisZ1Q5bmdvaFYfy26gxTrY8Ab3hkv74ZLLjktz05YcdBlaerpIVR1AmX8WSLciE7/xHQ6iZjdtKMiBQ7DCCiaFhjLunZac9WEDMtkbuVQ4fhgAFPjmKck6os+S/C4jZ5de1JNj6Tfuc927wVi21lMKkV4ue/Ik5Sw4ZmFdmC13nHwfw+2Jd8xFJKx8fokS5yPyRgbQdjyjP5dhig8evsgypgCCgfBMLDdNLXRmZr/chvUo10xIxV6ohFd/L8fmBlbQi5hpH0GmSIPNN93kfuUQM7d1gb9h1AYuYjEjAKgmJVg= + From 16622f856bbc92b53e61185f4d480fbca9cc87ec Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 18 Dec 2024 21:39:57 +0530 Subject: [PATCH 3/4] Fix CLA signing script and sign CLA --- .cla/contributors.txt | 2 ++ .cla/sign.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.cla/contributors.txt b/.cla/contributors.txt index 7f78295..be14ffd 100644 --- a/.cla/contributors.txt +++ b/.cla/contributors.txt @@ -1,2 +1,4 @@ Drxv52be4bkwIk4djnqQl/PfJXwnwP2C5I5BMFEi5ikLMPzAjdz80oqEwZ7hw62BmnUtBiX57rg3nLuaCDJ2DIX4VXkUJWtFRUpDdSclJNa0O4Ts26s3fCaIHfpRO4cqtd5Pco1qyns/L0gjD2EEF2h5m1Qu7k/PRrR1XAFuJw5P6O2UIKTVoeKegw5NQirDAS9g4v8a9PLbSA4ias5Bu12Zx9hqm9Q9UMYNBFtOlmcGWKKMV5WmvT3+22VqHuLTIiOPbhZ6xIowJ6v+gxrQWWI43dW2A0jDvMpqlH4q/GscALjAlpWX4fOwO/Xp9rGF0rNgeUPOPRDd3uVY0v5lFpC6ddrhlrYo1JfecFaHwx/NGPLKvIw1vJe9D6DCzdisZ1Q5bmdvaFYfy26gxTrY8Ab3hkv74ZLLjktz05YcdBlaerpIVR1AmX8WSLciE7/xHQ6iZjdtKMiBQ7DCCiaFhjLunZac9WEDMtkbuVQ4fhgAFPjmKck6os+S/C4jZ5de1JNj6Tfuc927wVi21lMKkV4ue/Ik5Sw4ZmFdmC13nHwfw+2Jd8xFJKx8fokS5yPyRgbQdjyjP5dhig8evsgypgCCgfBMLDdNLXRmZr/chvUo10xIxV6ohFd/L8fmBlbQi5hpH0GmSIPNN93kfuUQM7d1gb9h1AYuYjEjAKgmJVg= +U4YAieRHJAgjTsn2khOtqpCUvIHgoF7pHvpr/3Z7WsrRo+NOTwdmW59buUw+8/ZS6UErdg4pi4gpq8pholBvQwtlYzvkMkHoeyr2/Q6KCMSB8sI3xJEW7rse0Tbjd/fNLO+dHRaUuufB4vDxQ7OSY3DLlz6QdLtMUriiwTzNOSNglu6C1C4jUckmiZaEY7F44vggdSdF6sbp/lnAipo732buZWspoVqQu3aPaph8lcDtjExX+iLevOusBkpGEVJuEo/j3VYoynPhTC3Y6wuZWJwLbAif1cmtl4kRmzjuFRBlN96742+0oNUnmk2GBYuel7YKkE94KAu+wRilGb1UfqUB5MkhUtsXv11ZhBJHvL5WuOpnCI8F/svP5zyiRQRSbiwsXDhFGv3gVj8Pp0MLNJaNnSx103xcnbCLAFdAkhJpyTbIjeZ6MQZ3U3BZBZ9QlKMcZevouDdbDbhKasMUvPComJczIWAVqEB28qHlgDl3pjrD5QrsTQ4CXUnUQx0Ri/2a56ePOK5tmDrOHRNyu/Agv/FiOKkWmRIYKtdc5J4qgKeI15zO7eAHHHyhQT2iEr4vf0lV2mBRFsel1w5BcOsVzfqwwO5PZ4FmwOvveyPnzPiNV4vz3nkbvyWJpjH511TVSy28h69NP4f3lp40moYdRJ+uC5blB38nAaXx3lI= + diff --git a/.cla/sign.sh b/.cla/sign.sh index d856140..1f0980a 100755 --- a/.cla/sign.sh +++ b/.cla/sign.sh @@ -62,7 +62,7 @@ if ! confirm "Write an encrypted version of this signature to .cla/contributors. exit 1 fi -echo $signature | openssl pkeyutl -encrypt -pubin -inkey "$path/key.pub" | base64 -w0 >> "$path/contributors.txt" +echo $signature | openssl pkeyutl -encrypt -pubin -inkey "$path/key.pub" | base64 -b 0 >> "$path/contributors.txt" echo >> "$path/contributors.txt" echo "Written signature to .cla/contributors.txt." From e5f82b602bf8ef333d31b50fe77b7c70810b867d Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 18 Dec 2024 21:41:43 +0530 Subject: [PATCH 4/4] Remove -b flag for base64 for CLA signing script This is to avoid possible inconsistencies when used with non mac OSs --- .cla/sign.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cla/sign.sh b/.cla/sign.sh index 1f0980a..01cd867 100755 --- a/.cla/sign.sh +++ b/.cla/sign.sh @@ -62,7 +62,7 @@ if ! confirm "Write an encrypted version of this signature to .cla/contributors. exit 1 fi -echo $signature | openssl pkeyutl -encrypt -pubin -inkey "$path/key.pub" | base64 -b 0 >> "$path/contributors.txt" +echo $signature | openssl pkeyutl -encrypt -pubin -inkey "$path/key.pub" | base64 >> "$path/contributors.txt" echo >> "$path/contributors.txt" echo "Written signature to .cla/contributors.txt."