From c872901269746fc53ef1ea1c0fbb9064b92fb3dd Mon Sep 17 00:00:00 2001 From: houseme Date: Wed, 9 Apr 2025 18:36:17 +0800 Subject: [PATCH] improve Cargo.toml and modify README.md conosel web static url --- Cargo.lock | 37 ++++++++++++++++++++++++++--- Cargo.toml | 16 ++++++++----- README.md | 3 ++- rustfs/Cargo.toml | 60 ++++++++++++++++++++--------------------------- 4 files changed, 72 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca4e5b4e9..68b1892ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3035,7 +3035,7 @@ dependencies = [ "madmin", "md-5", "netif", - "nix", + "nix 0.29.0", "num", "num_cpus", "path-absolutize", @@ -4698,6 +4698,24 @@ dependencies = [ "libc", ] +[[package]] +name = "libsystemd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c592dc396b464005f78a5853555b9f240bc5378bf5221acc4e129910b2678869" +dependencies = [ + "hmac 0.12.1", + "libc", + "log", + "nix 0.27.1", + "nom", + "once_cell", + "serde", + "sha2 0.10.8", + "thiserror 1.0.69", + "uuid", +] + [[package]] name = "libxdo" version = "0.6.0" @@ -5113,6 +5131,18 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.9.0", + "cfg-if", + "libc", + "memoffset", +] + [[package]] name = "nix" version = "0.29.0" @@ -7125,6 +7155,7 @@ dependencies = [ "iam", "jsonwebtoken", "lazy_static", + "libsystemd", "local-ip-address", "lock", "madmin", @@ -9894,7 +9925,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix", + "nix 0.29.0", "ordered-stream", "rand 0.8.5", "serde", @@ -9925,7 +9956,7 @@ dependencies = [ "futures-core", "futures-lite", "hex", - "nix", + "nix 0.29.0", "ordered-stream", "serde", "serde_repr", diff --git a/Cargo.toml b/Cargo.toml index 83e25a062..5a126ae34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,8 +33,12 @@ all = "warn" [workspace.dependencies] madmin = { path = "./madmin" } +atoi = "2.0.0" async-recursion = "1.0.5" async-trait = "0.1.87" +axum = "0.8.3" +axum-extra = "0.10.1" +axum-server = { version = "0.7.2", features = ["tls-rustls"] } backon = "1.3.0" bytes = "1.9.0" bytesize = "1.3.0" @@ -64,7 +68,10 @@ humantime = "2.1.0" keyring = { version = "3.6.1", features = ["apple-native", "windows-native", "sync-secret-service"] } lock = { path = "./common/lock" } lazy_static = "1.5.0" +libsystemd = "0.7.0" local-ip-address = "0.6.3" +matchit = "0.8.4" +md-5 = "0.10.6" mime = "0.3.17" netif = "0.1.6" once_cell = "1.21.1" @@ -101,8 +108,11 @@ s3s-policy = { git = "https://github.com/Nugine/s3s.git", rev = "ab139f72fe768fb shadow-rs = { version = "0.38.0", default-features = false } serde = { version = "1.0.217", features = ["derive"] } serde_json = "1.0.138" +serde_urlencoded = "0.7.1" sha2 = "0.10.8" +snafu = "0.8.5" tempfile = "3.16.0" +test-case = "3.3.1" thiserror = "2.0.12" time = { version = "0.3.41", features = [ "std", @@ -133,13 +143,7 @@ uuid = { version = "1.15.1", features = [ "fast-rng", "macro-diagnostics", ] } -axum = "0.8.3" -axum-extra = "0.10.1" -axum-server = { version = "0.7.2", features = ["tls-rustls"] } -md-5 = "0.10.6" workers = { path = "./common/workers" } -test-case = "3.3.1" -snafu = "0.8.5" [profile.wasm-dev] inherits = "dev" diff --git a/README.md b/README.md index 217ab3c14..9882ae927 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,8 @@ Or use Docker: # How to add Console web -1. wget [http://dl.rustfs.com/console/console.latest.tar.gz](https://dl.rustfs.com/console/rustfs-console-latest.zip) +1. +wget [http://dl.rustfs.com/console/console.latest.tar.gz](https://dl.rustfs.com/artifacts/console/rustfs-console-latest.zip) 2. mkdir in this repos folder `./rustfs/static` diff --git a/rustfs/Cargo.toml b/rustfs/Cargo.toml index 1ab8beb8a..902e0053c 100644 --- a/rustfs/Cargo.toml +++ b/rustfs/Cargo.toml @@ -16,12 +16,21 @@ workspace = true [dependencies] madmin.workspace = true +api = { path = "../s3select/api" } +appauth = { version = "0.0.1", path = "../appauth" } +atoi = { workspace = true } +axum.workspace = true +axum-extra = { workspace = true } +axum-server = { workspace = true } async-trait.workspace = true bytes.workspace = true +chrono = { workspace = true } clap.workspace = true csv = "1.3.1" +crypto = { path = "../crypto" } datafusion = { workspace = true } common.workspace = true +const-str = { version = "0.6.1", features = ["std", "proc"] } ecstore.workspace = true policy.workspace = true flatbuffers.workspace = true @@ -32,8 +41,14 @@ hyper.workspace = true hyper-util.workspace = true http.workspace = true http-body.workspace = true +iam = { path = "../iam" } +jsonwebtoken = "9.3.0" +libsystemd = { workspace = true } lock.workspace = true +local-ip-address = { workspace = true } +matchit = { workspace = true } mime.workspace = true +mime_guess = "2.0.5" netif.workspace = true once_cell.workspace = true pin-project-lite.workspace = true @@ -41,22 +56,22 @@ prost.workspace = true prost-types.workspace = true protos.workspace = true protobuf.workspace = true +query = { path = "../s3select/query" } rmp-serde.workspace = true +rustfs-obs = { workspace = true } rustls.workspace = true rustls-pemfile.workspace = true rustls-pki-types.workspace = true +rust-embed = { workspace = true, features = ["interpolate-folder-path"] } s3s.workspace = true serde.workspace = true serde_json.workspace = true +serde_urlencoded = { workspace = true } +shadow-rs.workspace = true tracing.workspace = true time = { workspace = true, features = ["parsing", "formatting", "serde"] } tokio-util.workspace = true -tokio = { workspace = true, features = [ - "rt-multi-thread", - "macros", - "net", - "signal", -] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros", "net", "signal"] } tokio-rustls.workspace = true lazy_static.workspace = true tokio-stream.workspace = true @@ -67,28 +82,9 @@ tracing-core = { workspace = true } tracing-error.workspace = true tracing-subscriber.workspace = true transform-stream.workspace = true -uuid = "1.15.1" -url.workspace = true -axum.workspace = true -axum-extra = { workspace = true } -axum-server = { workspace = true } -matchit = "0.8.4" -shadow-rs.workspace = true -const-str = { version = "0.6.1", features = ["std", "proc"] } -atoi = "2.0.0" -serde_urlencoded = "0.7.1" -crypto = { path = "../crypto" } -query = { path = "../s3select/query" } -api = { path = "../s3select/api" } -iam = { path = "../iam" } -jsonwebtoken = "9.3.0" tower-http.workspace = true -mime_guess = "2.0.5" -rust-embed = { workspace = true, features = ["interpolate-folder-path"] } -local-ip-address = { workspace = true } -chrono = { workspace = true } -rustfs-obs = { workspace = true } -appauth = { version = "0.0.1", path = "../appauth" } +url.workspace = true +uuid = "1.15.1" [build-dependencies] prost-build.workspace = true @@ -101,13 +97,9 @@ futures-util.workspace = true ecstore = { path = "../ecstore" } s3s.workspace = true clap = { workspace = true } -tracing-subscriber = { version = "0.3.19", features = ["env-filter", "time"] } -hyper-util = { version = "0.1.10", features = [ - "tokio", - "server-auto", - "server-graceful", -] } -transform-stream = "0.3.1" +tracing-subscriber = { workspace = true, features = ["env-filter", "time"] } +hyper-util = { workspace = true, features = ["tokio", "server-auto", "server-graceful"] } +transform-stream = { workspace = true } netif = "0.1.6" shadow-rs.workspace = true # pin-utils = "0.1.0"