add environment variables for ICON_CACHE_TTL and ICON_CACHE_NEGTTL

These aren't used yet, but will be utilized by the icon caching service
in a subsequent patch.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
This commit is contained in:
Steven Noonan 2018-12-18 13:33:31 -08:00
parent 371017b547
commit 848cd1dbec
No known key found for this signature in database
GPG Key ID: 7EACB44BA7B30DB9
2 changed files with 13 additions and 0 deletions

5
.env
View File

@ -10,6 +10,11 @@
# ICON_CACHE_FOLDER=data/icon_cache # ICON_CACHE_FOLDER=data/icon_cache
# ATTACHMENTS_FOLDER=data/attachments # ATTACHMENTS_FOLDER=data/attachments
## Cache time-to-live for successfully obtained icons, in seconds (0 is "forever")
# ICON_CACHE_TTL=2592000
## Cache time-to-live for icons which weren't available, in seconds (0 is "forever")
# ICON_CACHE_NEGTTL=259200
## Web vault settings ## Web vault settings
# WEB_VAULT_FOLDER=web-vault/ # WEB_VAULT_FOLDER=web-vault/
# WEB_VAULT_ENABLED=true # WEB_VAULT_ENABLED=true

View File

@ -255,6 +255,9 @@ pub struct Config {
icon_cache_folder: String, icon_cache_folder: String,
attachments_folder: String, attachments_folder: String,
icon_cache_ttl: u64,
icon_cache_negttl: u64,
private_rsa_key: String, private_rsa_key: String,
private_rsa_key_pem: String, private_rsa_key_pem: String,
public_rsa_key: String, public_rsa_key: String,
@ -304,6 +307,11 @@ impl Config {
icon_cache_folder: get_env_or("ICON_CACHE_FOLDER", format!("{}/{}", &df, "icon_cache")), icon_cache_folder: get_env_or("ICON_CACHE_FOLDER", format!("{}/{}", &df, "icon_cache")),
attachments_folder: get_env_or("ATTACHMENTS_FOLDER", format!("{}/{}", &df, "attachments")), attachments_folder: get_env_or("ATTACHMENTS_FOLDER", format!("{}/{}", &df, "attachments")),
// icon_cache_ttl defaults to 30 days (30 * 24 * 60 * 60 seconds)
icon_cache_ttl: get_env_or("ICON_CACHE_TTL", 2592000u64),
// icon_cache_negttl defaults to 3 days (3 * 24 * 60 * 60 seconds)
icon_cache_negttl: get_env_or("ICON_CACHE_NEGTTL", 259200u64),
private_rsa_key: format!("{}.der", &key), private_rsa_key: format!("{}.der", &key),
private_rsa_key_pem: format!("{}.pem", &key), private_rsa_key_pem: format!("{}.pem", &key),
public_rsa_key: format!("{}.pub.der", &key), public_rsa_key: format!("{}.pub.der", &key),