v1.2.3 backport db path environment variable fix (#2809)

* fix DB_PATH variable propagation (#2797)

* bump version for patch - backport environment variable for DB_PATH

---------

Co-authored-by: Lukas Schulte Pelkum <lockas.sp@proton.me>
This commit is contained in:
James Hodgkinson 2024-06-04 12:01:40 +10:00 committed by GitHub
parent c4153c96bb
commit eb34a70f0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 25 deletions

46
Cargo.lock generated
View file

@ -1088,7 +1088,7 @@ dependencies = [
[[package]] [[package]]
name = "daemon" name = "daemon"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"clap", "clap",
"clap_complete", "clap_complete",
@ -2930,7 +2930,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm-ipa-sync" name = "kanidm-ipa-sync"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
@ -2954,7 +2954,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm-ldap-sync" name = "kanidm-ldap-sync"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"base64urlsafedata 0.5.0", "base64urlsafedata 0.5.0",
"chrono", "chrono",
@ -2980,7 +2980,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_build_profiles" name = "kanidm_build_profiles"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"gix", "gix",
@ -2990,7 +2990,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_client" name = "kanidm_client"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"compact_jwt 0.4.1", "compact_jwt 0.4.1",
"hyper", "hyper",
@ -3010,7 +3010,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_lib_crypto" name = "kanidm_lib_crypto"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"argon2", "argon2",
"base64 0.21.7", "base64 0.21.7",
@ -3029,7 +3029,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_lib_file_permissions" name = "kanidm_lib_file_permissions"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"kanidm_utils_users", "kanidm_utils_users",
"whoami", "whoami",
@ -3037,7 +3037,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_proto" name = "kanidm_proto"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"base32", "base32",
"base64urlsafedata 0.5.0", "base64urlsafedata 0.5.0",
@ -3057,7 +3057,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_tools" name = "kanidm_tools"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"async-recursion", "async-recursion",
"clap", "clap",
@ -3089,7 +3089,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_unix_int" name = "kanidm_unix_int"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"base64urlsafedata 0.5.0", "base64urlsafedata 0.5.0",
@ -3130,14 +3130,14 @@ dependencies = [
[[package]] [[package]]
name = "kanidm_utils_users" name = "kanidm_utils_users"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"libc", "libc",
] ]
[[package]] [[package]]
name = "kanidmd_core" name = "kanidmd_core"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",
@ -3190,7 +3190,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_lib" name = "kanidmd_lib"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"base64urlsafedata 0.5.0", "base64urlsafedata 0.5.0",
@ -3249,7 +3249,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_lib_macros" name = "kanidmd_lib_macros"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3258,7 +3258,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_testkit" name = "kanidmd_testkit"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"compact_jwt 0.4.1", "compact_jwt 0.4.1",
@ -3296,7 +3296,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui_admin" name = "kanidmd_web_ui_admin"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"enum-iterator", "enum-iterator",
"gloo", "gloo",
@ -3318,7 +3318,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui_login_flows" name = "kanidmd_web_ui_login_flows"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"gloo", "gloo",
"gloo-utils 0.2.0", "gloo-utils 0.2.0",
@ -3339,7 +3339,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui_shared" name = "kanidmd_web_ui_shared"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"gloo", "gloo",
"js-sys", "js-sys",
@ -3358,7 +3358,7 @@ dependencies = [
[[package]] [[package]]
name = "kanidmd_web_ui_user" name = "kanidmd_web_ui_user"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"enum-iterator", "enum-iterator",
"gloo", "gloo",
@ -3782,7 +3782,7 @@ dependencies = [
[[package]] [[package]]
name = "nss_kanidm" name = "nss_kanidm"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"kanidm_unix_int", "kanidm_unix_int",
"lazy_static", "lazy_static",
@ -4163,7 +4163,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]] [[package]]
name = "orca" name = "orca"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"clap", "clap",
@ -4204,7 +4204,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "pam_kanidm" name = "pam_kanidm"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"kanidm_unix_int", "kanidm_unix_int",
"libc", "libc",
@ -5324,7 +5324,7 @@ dependencies = [
[[package]] [[package]]
name = "sketching" name = "sketching"
version = "1.2.1" version = "1.2.3"
dependencies = [ dependencies = [
"gethostname", "gethostname",
"num_enum", "num_enum",

View file

@ -32,7 +32,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "1.2.2" version = "1.2.3"
authors = [ authors = [
"William Brown <william@blackhats.net.au>", "William Brown <william@blackhats.net.au>",
"James Hodgkinson <james@terminaloutcomes.com>", "James Hodgkinson <james@terminaloutcomes.com>",

View file

@ -274,7 +274,7 @@ impl ServerConfig {
self.origin = Some(value.to_string()); self.origin = Some(value.to_string());
} }
"DB_PATH" => { "DB_PATH" => {
self.origin = Some(value.to_string()); self.db_path = Some(value.to_string());
} }
"TLS_CHAIN" => { "TLS_CHAIN" => {
self.tls_chain = Some(value.to_string()); self.tls_chain = Some(value.to_string());