From cb595f0bf5cbacce33d0fb8e5f1f6e9a8a6e4dfc Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 13 Jun 2022 20:21:34 +0200 Subject: [PATCH] chore: replace deprecated binary and conv functions --- overlay/etc/templates/config.toml.tmpl | 6 +++--- overlay/usr/local/bin/entrypoint | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/overlay/etc/templates/config.toml.tmpl b/overlay/etc/templates/config.toml.tmpl index 6998592..d70a07e 100644 --- a/overlay/etc/templates/config.toml.tmpl +++ b/overlay/etc/templates/config.toml.tmpl @@ -8,8 +8,8 @@ ldap_host = "{{ getenv "VAULTWARDEN_LDAP_HOST" }}" {{ if (getenv "VAULTWARDEN_LDAP_SCHEME") -}} ldap_scheme = "{{ getenv "VAULTWARDEN_LDAP_SCHEME" }}" {{ end -}} -ldap_ssl = {{ getenv "VAULTWARDEN_LDAP_SSL" "true" | conv.Bool }} -ldap_no_tls_verify = {{ not (getenv "VAULTWARDEN_LDAP_SSL_VERIFY" "true" | conv.Bool) }} +ldap_ssl = {{ getenv "VAULTWARDEN_LDAP_SSL" "true" | conv.ToBool }} +ldap_no_tls_verify = {{ not (getenv "VAULTWARDEN_LDAP_SSL_VERIFY" "true" | conv.ToBool) }} {{ if (getenv "VAULTWARDEN_LDAP_PORT") -}} ldap_port = {{ getenv "VAULTWARDEN_LDAP_PORT" }} {{ end -}} @@ -19,4 +19,4 @@ ldap_search_base_dn = "{{ getenv "VAULTWARDEN_LDAP_SEARCH_BASE_DN" }}" ldap_search_filter = "{{ getenv "VAULTWARDEN_LDAP_SEARCH_FILTER" "(&(objectClass=*)(uid=*))" }}" ldap_mail_field = "{{ getenv "VAULTWARDEN_LDAP_MAIL_FIELD" "mail" }}" ldap_sync_interval_seconds = {{ getenv "VAULTWARDEN_LDAP_SYNC_INTERVAL_SECONDS" "60" }} -ldap_sync_loop = {{ getenv "VAULTWARDEN_LDAP_SYNC_LOOP" "true" | conv.Bool }} +ldap_sync_loop = {{ getenv "VAULTWARDEN_LDAP_SYNC_LOOP" "true" | conv.ToBool }} diff --git a/overlay/usr/local/bin/entrypoint b/overlay/usr/local/bin/entrypoint index 23d67f9..02dad21 100755 --- a/overlay/usr/local/bin/entrypoint +++ b/overlay/usr/local/bin/entrypoint @@ -27,7 +27,7 @@ if [ -n "$VAULTWARDEN_LDAP_VAULTWARDEN_URL" ]; then fi if [ -n "$VAULTWARDEN_LDAP_HOST" ]; then - WAITFOR_LDAP_SSL=$(/usr/local/bin/gomplate -i '{{ getenv "VAULTWARDEN_LDAP_SSL" "true" | conv.Bool }}') + WAITFOR_LDAP_SSL=$(/usr/local/bin/gomplate -i '{{ getenv "VAULTWARDEN_LDAP_SSL" "true" | conv.ToBool }}') if [ -z "$VAULTWARDEN_LDAP_PORT" ]; then [ "$WAITFOR_LDAP_SSL" = true ] && VAULTWARDEN_LDAP_PORT=636 || VAULTWARDEN_LDAP_PORT=389 -- 2.45.2