From 48944b367d941bede6730e36e9da7a90d6f49a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 23 May 2024 17:27:22 +0100 Subject: [PATCH 1/3] chore(rust): fix the configuration example --- rust/agama-server/share/server-example.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/agama-server/share/server-example.yaml b/rust/agama-server/share/server-example.yaml index d0d8c4f399..a6f1bdba23 100644 --- a/rust/agama-server/share/server-example.yaml +++ b/rust/agama-server/share/server-example.yaml @@ -1,2 +1,2 @@ --- -jwt_key: "replace-me" +jwt_secret: "replace-me" From cf6ce68752a3090f0d84988e2abd3e34538c4da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 24 May 2024 00:06:27 +0100 Subject: [PATCH 2/3] chore(rust): move testing server configuration to etc/agama.d --- rust/.gitignore | 3 +++ rust/agama-server/src/web/config.rs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rust/.gitignore b/rust/.gitignore index f2e972dd87..8a45e69442 100644 --- a/rust/.gitignore +++ b/rust/.gitignore @@ -4,3 +4,6 @@ # These are backup files generated by rustfmt **/*.rs.bk + +# Agama configuration file +/etc/agama.d diff --git a/rust/agama-server/src/web/config.rs b/rust/agama-server/src/web/config.rs index 0292d6d361..224ce63d93 100644 --- a/rust/agama-server/src/web/config.rs +++ b/rust/agama-server/src/web/config.rs @@ -31,7 +31,7 @@ impl ServiceConfig { .set_default("jwt_secret", jwt_secret)? .add_source(File::with_name("/usr/etc/agama.d/server").required(false)) .add_source(File::with_name("/etc/agama.d/server").required(false)) - .add_source(File::with_name("agama-dbus-server/share/server").required(false)) + .add_source(File::with_name("etc/agama.d/server").required(false)) .build()?; config.try_deserialize() } From 8c7c9bdaf6151812a82aac77187d5618c9c077e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 24 May 2024 00:12:36 +0100 Subject: [PATCH 3/3] chore(rust): use a better jwt_secret example --- rust/agama-server/share/server-example.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/agama-server/share/server-example.yaml b/rust/agama-server/share/server-example.yaml index a6f1bdba23..cfc3379fef 100644 --- a/rust/agama-server/share/server-example.yaml +++ b/rust/agama-server/share/server-example.yaml @@ -1,2 +1,2 @@ --- -jwt_secret: "replace-me" +jwt_secret: "UhLgulLqwi8fKSVez3Mrc8HYFXEnB"