From 7c977fc3d907a4f2f87dc035c8bba7d2f926f52b Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 25 Mar 2024 12:50:22 +0100 Subject: [PATCH] feat(ds-fr): Update --- machines/compute01/ds-fr/package/default.nix | 3 +-- machines/compute01/ds-fr/package/meta.nix | 4 ++-- .../ds-fr/package/patches/secrets-fc.patch | 19 ------------------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 machines/compute01/ds-fr/package/patches/secrets-fc.patch diff --git a/machines/compute01/ds-fr/package/default.nix b/machines/compute01/ds-fr/package/default.nix index 650bd27..af6732e 100644 --- a/machines/compute01/ds-fr/package/default.nix +++ b/machines/compute01/ds-fr/package/default.nix @@ -18,7 +18,7 @@ let inherit (lib) getExe; # Head of the DGNum repo - dgn-id = "8eecf28eeaf39bade8aed5e191a5bbf794dec4cc"; + dgn-id = "12e4a32ca5d909a90ca6f7e53081cc6b6b14c416"; pname = "ds-fr"; meta = import ./meta.nix; @@ -116,7 +116,6 @@ stdenv.mkDerivation { ./patches/replay_routing_engine_for_a_cloned_procedure.patch ./patches/smtp_settings.patch ./patches/garage.patch - ./patches/secrets-fc.patch ]; postPatch = '' diff --git a/machines/compute01/ds-fr/package/meta.nix b/machines/compute01/ds-fr/package/meta.nix index 991bbd5..6b5d27f 100644 --- a/machines/compute01/ds-fr/package/meta.nix +++ b/machines/compute01/ds-fr/package/meta.nix @@ -1,5 +1,5 @@ { - version = "2024-03-14-01"; - src-hash = "sha256-eWQp+c2k5GWBdJw7coK5dL7y6j8t6ZVUnYP7iasau/4="; + version = "2024-03-22-04"; + src-hash = "sha256-e+QXei09dJZ8Lbtrqv+6SbOpwMOedvASpvVy+LN29xs="; deps-hash = "sha256-9HbZtk0sgBSWzzFrjXnSyEVWaQMiyC1v89vXB0UK9Hc="; } diff --git a/machines/compute01/ds-fr/package/patches/secrets-fc.patch b/machines/compute01/ds-fr/package/patches/secrets-fc.patch deleted file mode 100644 index 2b6a889..0000000 --- a/machines/compute01/ds-fr/package/patches/secrets-fc.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/config/secrets.yml b/config/secrets.yml -index 866fa6159..6fd49ee59 100644 ---- a/config/secrets.yml -+++ b/config/secrets.yml -@@ -23,10 +23,10 @@ defaults: &defaults - identifier: <%= ENV['FC_PARTICULIER_ID'] %> - secret: <%= ENV['FC_PARTICULIER_SECRET'] %> - redirect_uri: https://<%= ENV['APP_HOST'] %>/france_connect/particulier/callback -- authorization_endpoint: <%= ENV['FC_PARTICULIER_BASE_URL'] %>/api/v1/authorize -- token_endpoint: <%= ENV['FC_PARTICULIER_BASE_URL'] %>/api/v1/token -- userinfo_endpoint: <%= ENV['FC_PARTICULIER_BASE_URL'] %>/api/v1/userinfo -- logout_endpoint: <%= ENV['FC_PARTICULIER_BASE_URL'] %>/api/v1/logout -+ authorization_endpoint: <%= ENV['FC_PARTICULIER_BASE_URL'] %>/ui/oauth2 -+ token_endpoint: <%= ENV['FC_PARTICULIER_BASE_URL'] %>/oauth2/token -+ userinfo_endpoint: <%= ENV['FC_PARTICULIER_BASE_URL'] %>/oauth2/openid/demarches_dgn/userinfo -+ logout_endpoint: <%= ENV['FC_PARTICULIER_BASE_URL'] %>/oauth2/token/revoke - agent_connect: - identifier: <%= ENV['AGENT_CONNECT_ID'] %> - secret: <%= ENV['AGENT_CONNECT_SECRET'] %>