diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..d716ba76 Binary files /dev/null and b/.DS_Store differ diff --git a/resources/vaultwarden-icon-white.svg b/resources/vaultwarden-icon-white.svg index bb241d51..60aaf535 100644 --- a/resources/vaultwarden-icon-white.svg +++ b/resources/vaultwarden-icon-white.svg @@ -1,78 +1,5 @@ - - - - - Vaultwarden Icon - White - - - - - Vaultwarden Icon - White - - - Mathijs van Veluw - - - Rust Logo - - - - + + + Vaultwarden Icon - White + + \ No newline at end of file diff --git a/resources/vaultwarden-icon.svg b/resources/vaultwarden-icon.svg index 91abbd6a..ccade936 100644 --- a/resources/vaultwarden-icon.svg +++ b/resources/vaultwarden-icon.svg @@ -1,74 +1,9 @@ - - - - - Vaultwarden Icon - \ No newline at end of file diff --git a/resources/vaultwarden-logo-auto.svg b/resources/vaultwarden-logo-auto.svg index 99f788c7..5543f284 100644 --- a/resources/vaultwarden-logo-auto.svg +++ b/resources/vaultwarden-logo-auto.svg @@ -1,78 +1,14 @@ - - \ No newline at end of file diff --git a/resources/vaultwarden-logo-white.svg b/resources/vaultwarden-logo-white.svg index 49a75eb6..d3b3f600 100644 --- a/resources/vaultwarden-logo-white.svg +++ b/resources/vaultwarden-logo-white.svg @@ -1,88 +1,9 @@ - - - + + Vaultwarden Logo - White - - - - - - - - + - aultwarden - - - - - - - image/svg+xml - - Vaultwarden Logo - White - - - Mathijs van Veluw - - - Rust Logo - - - - + + Locker + \ No newline at end of file diff --git a/src/api/admin.rs b/src/api/admin.rs index b2601cab..6b954963 100644 --- a/src/api/admin.rs +++ b/src/api/admin.rs @@ -98,7 +98,7 @@ const DT_FMT: &str = "%Y-%m-%d %H:%M:%S %Z"; const BASE_TEMPLATE: &str = "admin/base"; -const ACTING_ADMIN_USER: &str = "vaultwarden-admin-00000-000000000000"; +const ACTING_ADMIN_USER: &str = "z1-locker-admin-00000-000000000000"; pub const FAKE_ADMIN_UUID: &str = "00000000-0000-0000-0000-000000000000"; fn admin_path() -> String { diff --git a/src/config.rs b/src/config.rs index 5b995c6d..3cf90ec7 100644 --- a/src/config.rs +++ b/src/config.rs @@ -544,7 +544,7 @@ make_config! { admin_token: Pass, true, option; /// Invitation organization name |> Name shown in the invitation emails that don't come from a specific organization - invitation_org_name: String, true, def, "Vaultwarden".to_string(); + invitation_org_name: String, true, def, "Z1 Locker".to_string(); /// Events days retain |> Number of days to retain events stored in the database. If unset, events are kept indefinitely. events_days_retain: i64, false, option; @@ -725,7 +725,7 @@ make_config! { /// From Address smtp_from: String, true, def, String::new(); /// From Name - smtp_from_name: String, true, def, "Vaultwarden".to_string(); + smtp_from_name: String, true, def, "Z1 Locker".to_string(); /// Username smtp_username: String, true, option; /// Password diff --git a/src/http_client.rs b/src/http_client.rs index 5feeeedd..ccb07d98 100644 --- a/src/http_client.rs +++ b/src/http_client.rs @@ -34,7 +34,7 @@ pub fn make_http_request(method: reqwest::Method, url: &str) -> Result ClientBuilder { let mut headers = header::HeaderMap::new(); - headers.insert(header::USER_AGENT, header::HeaderValue::from_static("Vaultwarden")); + headers.insert(header::USER_AGENT, header::HeaderValue::from_static("Z1 Locker")); let redirect_policy = reqwest::redirect::Policy::custom(|attempt| { if attempt.previous().len() >= 5 { diff --git a/src/main.rs b/src/main.rs index fc104997..18deae1f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -76,7 +76,7 @@ async fn main() -> Result<(), Error> { check_data_folder().await; auth::initialize_keys().await.unwrap_or_else(|e| { - error!("Error creating private key '{}'\n{e:?}\nExiting Vaultwarden!", CONFIG.private_rsa_key()); + error!("Error creating private key '{}'\n{e:?}\nExiting Z1 Locker!", CONFIG.private_rsa_key()); exit(1); }); check_web_vault(); @@ -95,7 +95,7 @@ const HELP: &str = "\ Alternative implementation of the Bitwarden server API written in Rust USAGE: - vaultwarden [FLAGS|COMMAND] + z1-locker [FLAGS|COMMAND] FLAGS: -h, --help Prints help information @@ -119,13 +119,13 @@ async fn parse_args() { let version = VERSION.unwrap_or("(Version info from Git not present)"); if pargs.contains(["-h", "--help"]) { - println!("Vaultwarden {version}"); + println!("Z1 Locker {version}"); print!("{HELP}"); exit(0); } else if pargs.contains(["-v", "--version"]) { config::SKIP_CONFIG_VALIDATION.store(true, Ordering::Relaxed); let web_vault_version = util::get_web_vault_version(); - println!("Vaultwarden {version}"); + println!("Z1 Locker {version}"); println!("Web-Vault {web_vault_version}"); exit(0); } @@ -221,7 +221,7 @@ fn launch_info() { println!( "\ /--------------------------------------------------------------------\\\n\ - | Starting Vaultwarden |" + | Starting Z1 Locker |" ); if let Some(version) = VERSION { @@ -440,7 +440,7 @@ fn chain_syslog(logger: fern::Dispatch) -> fern::Dispatch { let syslog_fmt = syslog::Formatter3164 { facility: syslog::Facility::LOG_USER, hostname: None, - process: "vaultwarden".into(), + process: "z1-locker".into(), pid: 0, }; @@ -607,7 +607,7 @@ async fn launch_rocket(pool: db::DbPool, extra_debug: bool) -> Result<(), Error> tokio::spawn(async move { tokio::signal::ctrl_c().await.expect("Error setting Ctrl-C handler"); - info!("Exiting Vaultwarden!"); + info!("Exiting Z1 Locker!"); CONFIG.shutdown(); }); @@ -629,7 +629,7 @@ async fn launch_rocket(pool: db::DbPool, extra_debug: bool) -> Result<(), Error> instance.launch().await?; - info!("Vaultwarden process exited!"); + info!("Z1 Locker process exited!"); Ok(()) } diff --git a/src/static/.DS_Store b/src/static/.DS_Store new file mode 100644 index 00000000..9c6941af Binary files /dev/null and b/src/static/.DS_Store differ diff --git a/src/static/images/.DS_Store b/src/static/images/.DS_Store new file mode 100644 index 00000000..8371bf95 Binary files /dev/null and b/src/static/images/.DS_Store differ diff --git a/src/static/images/logo-gray.png b/src/static/images/logo-gray.png index 8fb1148e..75bb8d92 100644 Binary files a/src/static/images/logo-gray.png and b/src/static/images/logo-gray.png differ diff --git a/src/static/images/vaultwarden-favicon.png b/src/static/images/vaultwarden-favicon.png index 15b499e8..7ca50b62 100644 Binary files a/src/static/images/vaultwarden-favicon.png and b/src/static/images/vaultwarden-favicon.png differ diff --git a/src/static/images/vaultwarden-icon.png b/src/static/images/vaultwarden-icon.png index 3a6c0668..643f1306 100644 Binary files a/src/static/images/vaultwarden-icon.png and b/src/static/images/vaultwarden-icon.png differ diff --git a/src/static/templates/404.hbs b/src/static/templates/404.hbs index 064dc5a1..5c3404f6 100644 --- a/src/static/templates/404.hbs +++ b/src/static/templates/404.hbs @@ -5,16 +5,16 @@ - Page not found! + 404 - Page Not Found -