From 4395e8e8888ddb043d870d21e110ad6dc13b09ed Mon Sep 17 00:00:00 2001 From: BlackDex Date: Sat, 29 Jul 2023 13:10:46 +0200 Subject: [PATCH] Fix .env.template file There was one item missing and one item wrongly named. This has been fixed including a spellcheck. --- .env.template | 6 +++++- src/config.rs | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.env.template b/.env.template index 6e164152..98bed0b7 100644 --- a/.env.template +++ b/.env.template @@ -30,6 +30,10 @@ ## Define the size of the connection pool used for connecting to the database. # DATABASE_MAX_CONNS=10 +## Database timeout +## Timeout when acquiring database connection +# DATABASE_TIMEOUT=30 + ## Database connection initialization ## Allows SQL statements to be run whenever a new database connection is created. ## This is mainly useful for connection-scoped pragmas. @@ -77,7 +81,7 @@ # PUSH_INSTALLATION_ID=CHANGEME # PUSH_INSTALLATION_KEY=CHANGEME ## Don't change this unless you know what you're doing. -# PUSH_RELAY_BASE_URI=https://push.bitwarden.com +# PUSH_RELAY_URI=https://push.bitwarden.com ## Controls whether users are allowed to create Bitwarden Sends. ## This setting applies globally to all users. diff --git a/src/config.rs b/src/config.rs index 7351b941..1173afb9 100644 --- a/src/config.rs +++ b/src/config.rs @@ -492,7 +492,7 @@ make_config! { /// 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(); - /// Events days retain |> Number of days to retain events stored in the database. If unset, events are kept indefently. + /// 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; }, @@ -520,7 +520,7 @@ make_config! { /// has been decided on, consider using permanent redirects for cacheability. The legacy codes /// are currently better supported by the Bitwarden clients. icon_redirect_code: u32, true, def, 302; - /// Positive icon cache expiry |> Number of seconds to consider that an already cached icon is fresh. After this period, the icon will be redownloaded + /// Positive icon cache expiry |> Number of seconds to consider that an already cached icon is fresh. After this period, the icon will be refreshed icon_cache_ttl: u64, true, def, 2_592_000; /// Negative icon cache expiry |> Number of seconds before trying to download an icon that failed again. icon_cache_negttl: u64, true, def, 259_200; @@ -530,7 +530,7 @@ make_config! { /// Useful to hide other servers in the local network. Check the WIKI for more details icon_blacklist_regex: String, true, option; /// Icon blacklist non global IPs |> Any IP which is not defined as a global IP will be blacklisted. - /// Usefull to secure your internal environment: See https://en.wikipedia.org/wiki/Reserved_IP_addresses for a list of IPs which it will block + /// Useful to secure your internal environment: See https://en.wikipedia.org/wiki/Reserved_IP_addresses for a list of IPs which it will block icon_blacklist_non_global_ips: bool, true, def, true; /// Disable Two-Factor remember |> Enabling this would force the users to use a second factor to login every time. @@ -566,7 +566,7 @@ make_config! { /// Max database connection retries |> Number of times to retry the database connection during startup, with 1 second between each retry, set to 0 to retry indefinitely db_connection_retries: u32, false, def, 15; - /// Timeout when aquiring database connection + /// Timeout when acquiring database connection database_timeout: u64, false, def, 30; /// Database connection pool size