From 780547fd6f2af8a98100c54bbf5e3d7a7ee5bd9c Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 30 Jun 2022 10:50:03 +0200 Subject: [PATCH] Rename mailrage to aerogramme in missing places --- .gitignore | 2 +- Cargo.lock | 84 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- README.md | 2 +- src/main.rs | 6 ++-- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 79358d8..deb0fec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /target .vimrc env.sh -mailrage.toml +aerogramme.toml *.swo *.swp diff --git a/Cargo.lock b/Cargo.lock index a430b9e..a04cfe4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,48 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aerogramme" +version = "0.0.1" +dependencies = [ + "anyhow", + "argon2", + "async-trait", + "base64", + "boitalettres", + "clap", + "duplexify", + "futures", + "hex", + "im", + "imap-codec", + "itertools", + "k2v-client", + "lazy_static", + "ldap3", + "log", + "mail-parser", + "pretty_env_logger", + "rand", + "rmp-serde", + "rpassword", + "rusoto_core", + "rusoto_credential", + "rusoto_s3", + "rusoto_signature", + "serde", + "smtp-message", + "smtp-server", + "sodiumoxide", + "tokio", + "tokio-util", + "toml", + "tower", + "tracing", + "tracing-subscriber", + "zstd", +] + [[package]] name = "aho-corasick" version = "0.7.18" @@ -1278,48 +1320,6 @@ dependencies = [ "serde", ] -[[package]] -name = "mailrage" -version = "0.0.1" -dependencies = [ - "anyhow", - "argon2", - "async-trait", - "base64", - "boitalettres", - "clap", - "duplexify", - "futures", - "hex", - "im", - "imap-codec", - "itertools", - "k2v-client", - "lazy_static", - "ldap3", - "log", - "mail-parser", - "pretty_env_logger", - "rand", - "rmp-serde", - "rpassword", - "rusoto_core", - "rusoto_credential", - "rusoto_s3", - "rusoto_signature", - "serde", - "smtp-message", - "smtp-server", - "sodiumoxide", - "tokio", - "tokio-util", - "toml", - "tower", - "tracing", - "tracing-subscriber", - "zstd", -] - [[package]] name = "matches" version = "0.1.9" diff --git a/Cargo.toml b/Cargo.toml index be05124..cad5bef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mailrage" +name = "aerogramme" version = "0.0.1" authors = ["Alex Auvolat "] edition = "2021" diff --git a/README.md b/README.md index 215fc17..b635042 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ aws_access_key_id = "GK..." aws_secret_access_key = "c0ffee..." ``` -Next create the config file `mailrage.toml`: +Next create the config file `aerogramme.toml`: ``` s3_endpoint = "http://127.0.0.1:3900" diff --git a/src/main.rs b/src/main.rs index 6744157..b27c891 100644 --- a/src/main.rs +++ b/src/main.rs @@ -30,12 +30,12 @@ struct Args { enum Command { /// Runs the IMAP+LMTP server daemon Server { - #[clap(short, long, env = "CONFIG_FILE", default_value = "mailrage.toml")] + #[clap(short, long, env = "CONFIG_FILE", default_value = "aerogramme.toml")] config_file: PathBuf, }, /// TEST TEST TEST Test { - #[clap(short, long, env = "CONFIG_FILE", default_value = "mailrage.toml")] + #[clap(short, long, env = "CONFIG_FILE", default_value = "aerogramme.toml")] config_file: PathBuf, }, /// Initializes key pairs for a user and adds a key decryption password @@ -115,7 +115,7 @@ struct UserSecretsArgs { #[tokio::main] async fn main() -> Result<()> { if std::env::var("RUST_LOG").is_err() { - std::env::set_var("RUST_LOG", "main=info,mailrage=info,k2v_client=info") + std::env::set_var("RUST_LOG", "main=info,aerogramme=info,k2v_client=info") } // Abort on panic (same behavior as in Go)