mobilizon: 4.0.0 -> 4.0.2

This commit is contained in:
Kerstin Humm 2023-12-11 02:33:20 +01:00 committed by Yt
parent c68839c5d5
commit a81c0c887b
3 changed files with 21 additions and 30 deletions

View file

@ -1,16 +0,0 @@
diff --git a/config/config.exs b/config/config.exs
index d75b2e10a..d46ebffd2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -128,7 +128,9 @@ config :mobilizon, Mobilizon.Web.Email.Mailer,
tls_options: [
verify: :verify_peer,
versions: [:"tlsv1.2", :"tlsv1.3"],
- cacerts: :public_key.cacerts_get(),
+ cacerts: if System.get_env("SSL_CERT_FILE") != nil and :public_key.cacerts_load(System.get_env("SSL_CERT_FILE")) == :ok do
+ :public_key.cacerts_get()
+ end,
server_name_indication: ~c"localhost",
depth: 99
],

View file

@ -1,19 +1,13 @@
{ fetchFromGitLab, applyPatches }: rec {
{ fetchFromGitLab }: rec {
pname = "mobilizon";
version = "4.0.0";
version = "4.0.2";
src = applyPatches {
src = fetchFromGitLab {
domain = "framagit.org";
owner = "framasoft";
repo = pname;
rev = version;
sha256 = "sha256-PslcIS+HjGTx8UYhb7BG2OgLXfIWHDouuiogA/rq/7M=";
};
patches = [
# See https://framagit.org/framasoft/mobilizon/-/merge_requests/1452
./cacerts_get.patch
];
src = fetchFromGitLab {
domain = "framagit.org";
owner = "framasoft";
repo = pname;
rev = version;
sha256 = "sha256-Ri1qCiQaKlSTSSGWHzFqYBCoTEMtOtwe0Kli466dv4M=";
};
}

View file

@ -1789,6 +1789,19 @@ let
beamDeps = [ combine gettext tzdata ];
};
tls_certificate_check = buildRebar3 rec {
name = "tls_certificate_check";
version = "1.20.0";
src = fetchHex {
pkg = "tls_certificate_check";
version = "${version}";
sha256 = "ab57b74b1a63dc5775650699a3ec032ec0065005eff1f020818742b7312a8426";
};
beamDeps = [ ssl_verify_fun ];
};
tz_world = buildMix rec {
name = "tz_world";
version = "1.3.1";