diff --git a/.drone.yml b/.drone.yml index 097fdbc..bec2406 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: binary - image: clux/muslrust:nightly-2019-12-19 + image: clux/muslrust:nightly-2020-10-02 commands: - make build environment: @@ -165,6 +165,6 @@ depends_on: --- kind: signature -hmac: 57fb33ba361540dfd86aadf2d2ea91218ab31e5ee755ff4f5f692fe6612d5c86 +hmac: 718fe4ae13950e823bb1bf64a90c407f0a03aeb2afa66f2c4a14b7b3e80aac3f ... diff --git a/CHANGELOG.md b/CHANGELOG.md index 54596a0..4a405cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,5 @@ - INTERNAL - - migrate to `thegeeklab` namespace + - setup renovate-bot + - update bitwarden_rs_ldap to v0.2.0 + - add variable `BITWARDENRS_LDAP_BITWARDEN_ROOT_CERT_FILE` + - add variable `BITWARDENRS_LDAP_SSL_VERIFY` diff --git a/Makefile b/Makefile index 2e0a2fd..87d5011 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +# renovate: datasource=github-releases depName=ViViDboarder/bitwarden_rs_ldap export BUILD_VERSION ?= master export DEBIAN_FRONTEND ?= noninteractive export LANG ?= C.UTF-8 diff --git a/README.md b/README.md index 2b71a93..435df8e 100644 --- a/README.md +++ b/README.md @@ -70,9 +70,12 @@ volumes: ```Shell BITWARDENRS_LDAP_BITWARDEN_URL= BITWARDENRS_LDAP_BITWARDEN_ADMIN_TOKEN= +BITWARDENRS_LDAP_BITWARDEN_ROOT_CERT_FILE= + BITWARDENRS_LDAP_HOST= BITWARDENRS_LDAP_SCHEME= BITWARDENRS_LDAP_SSL=True +BITWARDENRS_LDAP_SSL_VERIFY=True BITWARDENRS_LDAP_PORT= BITWARDENRS_LDAP_BIND_DN= BITWARDENRS_LDAP_BIND_PASSWORD= diff --git a/docker-compose.yml b/docker-compose.yml index 8b349be..f196d47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ --- -version: '3' +version: "3" services: postgres: diff --git a/overlay/etc/templates/config.toml.tmpl b/overlay/etc/templates/config.toml.tmpl index 843d84e..1560860 100644 --- a/overlay/etc/templates/config.toml.tmpl +++ b/overlay/etc/templates/config.toml.tmpl @@ -1,11 +1,15 @@ ## Bitwarden_RS LDAP Configuration File bitwarden_url = "{{ getenv "BITWARDENRS_LDAP_BITWARDEN_URL" }}" bitwarden_admin_token = "{{ getenv "BITWARDENRS_LDAP_BITWARDEN_ADMIN_TOKEN" }}" +{{ if (getenv "BITWARDENRS_LDAP_BITWARDEN_ROOT_CERT_FILE") -}} +bitwarden_root_cert_file = "{{ getenv "BITWARDENRS_LDAP_BITWARDEN_ROOT_CERT_FILE" }}" +{{ end -}} ldap_host = "{{ getenv "BITWARDENRS_LDAP_HOST" }}" {{ if (getenv "BITWARDENRS_LDAP_SCHEME") -}} ldap_scheme = "{{ getenv "BITWARDENRS_LDAP_SCHEME" }}" {{ end -}} ldap_ssl = {{ getenv "BITWARDENRS_LDAP_SSL" "true" | conv.Bool }} +ldap_no_tls_verify = {{ not (getenv "BITWARDENRS_LDAP_SSL_VERIFY" "true" | conv.Bool) }} {{ if (getenv "BITWARDENRS_LDAP_PORT") -}} ldap_port = {{ getenv "BITWARDENRS_LDAP_PORT" }} {{ end -}} diff --git a/renovate.json b/renovate.json index 39a2b6e..265faad 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,25 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" + "extends": ["config:base"], + "regexManagers": [ + { + "fileMatch": ["^Dockerfile$"], + "matchStrings": [ + "datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\sENV .*?_VERSION=\"\\${.*:-(?.*)}\"\\s" + ] + }, + { + "fileMatch": ["^Makefile$"], + "matchStrings": [ + "datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\sexport .*?_VERSION \\?= (?.*)\\s" + ] + } + ], + "packageRules": [ + { + "datasources": ["github-releases"], + "groupName": "bitwarden_rs_ldap packages", + "packagePatterns": ["^ViViDboarder"] + } ] }