From eabe1a96a9043a57ba643846ac7993f12e876a01 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 18 Jan 2020 17:27:06 +0100 Subject: [PATCH] convert bool strings --- overlay/etc/templates/env.tmpl | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/overlay/etc/templates/env.tmpl b/overlay/etc/templates/env.tmpl index a0dbf52..f52efae 100644 --- a/overlay/etc/templates/env.tmpl +++ b/overlay/etc/templates/env.tmpl @@ -9,7 +9,7 @@ DATABASE_URL={{ getenv "BITWARDENRS_DATABASE_URL" }} {{ if (getenv "BITWARDENRS_TEMPLATES_FOLDER") -}} TEMPLATES_FOLDER={{ getenv "BITWARDENRS_TEMPLATES_FOLDER" }} {{ end -}} -RELOAD_TEMPLATES={{ getenv "BITWARDENRS_RELOAD_TEMPLATES" "false" }} +RELOAD_TEMPLATES={{ getenv "BITWARDENRS_RELOAD_TEMPLATES" "false" | conv.Bool }} IP_HEADER={{ getenv "BITWARDENRS_IP_HEADER" "X-Client-IP" }} @@ -17,37 +17,31 @@ ICON_CACHE_TTL={{ getenv "BITWARDENRS_ICON_CACHE_TTL" "2592000" }} ICON_CACHE_NEGTTL={{ getenv "BITWARDENRS_ICON_CACHE_NEGTTL" "259200" }} WEB_VAULT_FOLDER=/app/web-vault/ -WEB_VAULT_ENABLED={{ getenv "BITWARDENRS_WEB_VAULT_ENABLED" "true" }} +WEB_VAULT_ENABLED={{ getenv "BITWARDENRS_WEB_VAULT_ENABLED" "true" | conv.Bool }} -## Enables websocket notifications -# WEBSOCKET_ENABLED=false -## Controls the WebSocket server address and port -# WEBSOCKET_ADDRESS=0.0.0.0 -# WEBSOCKET_PORT=3012 - -EXTENDED_LOGGING={{ getenv "BITWARDENRS_EXTENDED_LOGGING" "true" }} +EXTENDED_LOGGING={{ getenv "BITWARDENRS_EXTENDED_LOGGING" "true" | conv.Bool }} LOG_LEVEL={{ getenv "BITWARDENRS_LOG_LEVEL" "Info" }} ENABLE_DB_WAL=true -DISABLE_ICON_DOWNLOAD={{ getenv "BITWARDENRS_DISABLE_ICON_DOWNLOAD" "false" }} +DISABLE_ICON_DOWNLOAD={{ getenv "BITWARDENRS_DISABLE_ICON_DOWNLOAD" "false" | conv.Bool }} ICON_DOWNLOAD_TIMEOUT={{ getenv "BITWARDENRS_ICON_DOWNLOAD_TIMEOUT" "10" }} {{ if (getenv "BITWARDENRS_ICON_BLACKLIST_REGEXL") -}} ICON_BLACKLIST_REGEX={{ getenv "BITWARDENRS_ICON_BLACKLIST_REGEXL" }} {{ end -}} -ICON_BLACKLIST_NON_GLOBAL_IPS={{ getenv "BITWARDENRS_ICON_BLACKLIST_NON_GLOBAL_IPS" "true" }} +ICON_BLACKLIST_NON_GLOBAL_IPS={{ getenv "BITWARDENRS_ICON_BLACKLIST_NON_GLOBAL_IPS" "true" | conv.Bool }} -DISABLE_2FA_REMEMBER={{ getenv "BITWARDENRS_DISABLE_2FA_REMEMBER" "false" }} +DISABLE_2FA_REMEMBER={{ getenv "BITWARDENRS_DISABLE_2FA_REMEMBER" "false" | conv.Bool }} -SIGNUPS_ALLOWED={{ getenv "BITWARDENRS_SIGNUPS_ALLOWED" "true" }} -SIGNUPS_VERIFY={{ getenv "BITWARDENRS_SIGNUPS_VERIFY" "false" }} +SIGNUPS_ALLOWED={{ getenv "BITWARDENRS_SIGNUPS_ALLOWED" "true" | conv.Bool }} +SIGNUPS_VERIFY={{ getenv "BITWARDENRS_SIGNUPS_VERIFY" "false" | conv.Bool }} SIGNUPS_VERIFY_RESEND_TIME={{ getenv "BITWARDENRS_SIGNUPS_VERIFY_RESEND_TIME" "3600" }} SIGNUPS_VERIFY_RESEND_LIMIT={{ getenv "BITWARDENRS_SIGNUPS_VERIFY_RESEND_LIMIT" "6" }} {{ if (getenv "BITWARDENRS_SIGNUPS_DOMAINS_WHITELIST") -}} SIGNUPS_DOMAINS_WHITELIST={{ getenv "BITWARDENRS_SIGNUPS_DOMAINS_WHITELIST" }} {{ end -}} -INVITATIONS_ALLOWED={{ getenv "BITWARDENRS_INVITATIONS_ALLOWED" "true" }} +INVITATIONS_ALLOWED={{ getenv "BITWARDENRS_INVITATIONS_ALLOWED" "true" | conv.Bool }} {{ if (getenv "BITWARDENRS_ADMIN_TOKEN") -}} ADMIN_TOKEN={{ getenv "BITWARDENRS_ADMIN_TOKEN" }} @@ -56,10 +50,10 @@ DISABLE_ADMIN_TOKEN=false PASSWORD_ITERATIONS={{ getenv "BITWARDENRS_PASSWORD_ITERATIONS" "100000" }} -SHOW_PASSWORD_HINT={{ getenv "BITWARDENRS_SHOW_PASSWORD_HINT" "true" }} +SHOW_PASSWORD_HINT={{ getenv "BITWARDENRS_SHOW_PASSWORD_HINT" "true" | conv.Bool }} DOMAIN={{ getenv "BITWARDENRS_DOMAIN" "http://localhost/" }} -AUTHENTICATOR_DISABLE_TIME_DRIFT={{ getenv "BITWARDENRS_AUTHENTICATOR_DISABLE_TIME_DRIFT" "false" }} +AUTHENTICATOR_DISABLE_TIME_DRIFT={{ getenv "BITWARDENRS_AUTHENTICATOR_DISABLE_TIME_DRIFT" "false" | conv.Bool }} ROCKET_ADDRESS=0.0.0.0 ROCKET_PORT=8080 @@ -69,7 +63,7 @@ SMTP_HOST={{ getenv "BITWARDENRS_SMTP_HOST" }} SMTP_FROM={{ getenv "BITWARDENRS_SMTP_FROM" }} SMTP_FROM_NAME={{ getenv "BITWARDENRS_SMTP_FROM_NAME" "Bitwarden_RS" }} SMTP_PORT={{ getenv "BITWARDENRS_SMTP_PORT" "587" }} -SMTP_SSL={{ getenv "BITWARDENRS_SMTP_SSL" "true" }} +SMTP_SSL={{ getenv "BITWARDENRS_SMTP_SSL" "true" | conv.Bool }} {{ if (getenv "BITWARDENRS_SMTP_USERNAME") -}} SMTP_USERNAME={{ getenv "BITWARDENRS_SMTP_USERNAME" }} SMTP_PASSWORD={{ getenv "BITWARDENRS_SMTP_PASSWORD" }}