From 4fb938c103d6a915afb00703b39db1ec197729ee Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 15 May 2021 22:09:29 +0200 Subject: [PATCH] chore: upstream project was renamed to vaultwarden (#1) Co-authored-by: Robert Kaussow Reviewed-on: https://gitea.rknet.org/ansible/xoxys.vaultwarden_ldap_docker/pulls/1 Co-authored-by: Robert Kaussow Co-committed-by: Robert Kaussow --- README.md | 8 +- defaults/main.yml | 78 +++++++++---------- meta/main.yml | 14 ++-- molecule/centos7/converge.yml | 14 ++-- molecule/centos7/molecule.yml | 2 +- molecule/centos7/tests/test_default.py | 4 +- tasks/setup.yml | 12 +-- .../services/bitwardenrs_ldap_compose.yml.j2 | 78 +++++++++---------- 8 files changed, 105 insertions(+), 105 deletions(-) diff --git a/README.md b/README.md index e161181..27efc6e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# xoxys.bitwardenrs_ldap_docker +# xoxys.vaultwarden_ldap_docker -[![Build Status](https://img.shields.io/drone/build/ansible/xoxys.bitwardenrs_ldap_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.bitwardenrs_ldap_docker) +[![Build Status](https://img.shields.io/drone/build/ansible/xoxys.vaultwarden_ldap_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.vaultwarden_ldap_docker) [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) -Role to setup a [BitwardenRS LDAP](https://gitea.rknet.org/docker/bitwarden_rs_ldap) Sync Service for [BitwardenRS](https://github.com/dani-garcia/bitwarden_rs) password safe. +Role to setup a [Vaultwarden LDAP](https://gitea.rknet.org/docker/vaultwarden-ldap) Sync Service for [Vaultwarden](https://github.com/dani-garcia/vaultwarden) password safe. -You can find the full documentation at [https://galaxy.geekdocs.de](https://galaxy.geekdocs.de/roles/cloud/bitwardenrs_ldap_docker/). +You can find the full documentation at [https://galaxy.geekdocs.de](https://galaxy.geekdocs.de/roles/cloud/vaultwarden_ldap_docker/). ## License diff --git a/defaults/main.yml b/defaults/main.yml index 0ccf15d..77accc3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,29 +1,29 @@ --- -bitwardenrs_ldap_version: latest -bitwardenrs_ldap_image: "thegeeklab/bitwardenrs_ldap:{{ bitwardenrs_ldap_version }}" +vaultwarden_ldap_version: latest +vaultwarden_ldap_image: "thegeeklab/vaultwarden_ldap:{{ vaultwarden_ldap_version }}" -bitwardenrs_ldap_service_directory: /var/lib/docker/services/bitwardenrs_ldap -bitwardenrs_ldap_container_name: bitwardenrs_ldap -bitwardenrs_ldap_restart_policy: always -bitwardenrs_ldap_service_stopped: False +vaultwarden_ldap_service_directory: /var/lib/docker/services/vaultwarden_ldap +vaultwarden_ldap_container_name: vaultwarden_ldap +vaultwarden_ldap_restart_policy: always +vaultwarden_ldap_service_stopped: False -# @var bitwardenrs_ldap_networks:example: > -# bitwardenrs_ldap_networks: +# @var vaultwarden_ldap_networks:example: > +# vaultwarden_ldap_networks: # - name: default # # optional network driver, defaults to 'bride' # driver: host # @end -bitwardenrs_ldap_networks: - - name: bitwardenrs_default +vaultwarden_ldap_networks: + - name: vaultwarden_default external: True -bitwardenrs_ldap_networks_applied: - - bitwardenrs_default +vaultwarden_ldap_networks_applied: + - vaultwarden_default -# @var bitwardenrs_ldap_volumes:description: > Define required docker volumes. +# @var vaultwarden_ldap_volumes:description: > Define required docker volumes. # @end -# @var bitwardenrs_ldap_volumes:example: > -# bitwardenrs_ldap_volumes: +# @var vaultwarden_ldap_volumes:example: > +# vaultwarden_ldap_volumes: # # Instead of the name you could specify a path on the container host system, # # but you also have to enable bind mount for this volume # - name: data @@ -33,30 +33,30 @@ bitwardenrs_ldap_networks_applied: # # keep in mind you MUST set bind in any case # bind: True # @end -bitwardenrs_ldap_volumes: [] +vaultwarden_ldap_volumes: [] -# @var bitwardenrs_ldap_memory_limit: $ "_unset_" -# @var bitwardenrs_ldap_memory_limit:example: $ "512m" -# @var bitwardenrs_ldap_memory_reservation: $ "_unset_" -# @var bitwardenrs_ldap_memory_reservation:example: $ "256m" -# @var bitwardenrs_ldap_cpu_shares: $ "_unset_" -# @var bitwardenrs_ldap_cpu_shares:example: $ "1024" +# @var vaultwarden_ldap_memory_limit: $ "_unset_" +# @var vaultwarden_ldap_memory_limit:example: $ "512m" +# @var vaultwarden_ldap_memory_reservation: $ "_unset_" +# @var vaultwarden_ldap_memory_reservation:example: $ "256m" +# @var vaultwarden_ldap_cpu_shares: $ "_unset_" +# @var vaultwarden_ldap_cpu_shares:example: $ "1024" -bitwardenrs_ldap_cap_add: [] -bitwardenrs_ldap_cap_drop: [] -bitwardenrs_ldap_security_opt: [] -# @var bitwardenrs_ldap_pids_limit: $ "_unset_" +vaultwarden_ldap_cap_add: [] +vaultwarden_ldap_cap_drop: [] +vaultwarden_ldap_security_opt: [] +# @var vaultwarden_ldap_pids_limit: $ "_unset_" -bitwardenrs_ldap_bitwarden_url: bitwarden.example.com -bitwardenrs_ldap_bitwarden_admin_token: abc123 -# @var bitwardenrs_ldap_host: $ "_unset_" -# @var bitwardenrs_ldap_scheme: $ "_unset_" -bitwardenrs_ldap_ssl: True -# @var bitwardenrs_ldap_port: $ "_unset_" -# @var bitwardenrs_ldap_bind_dn: $ "_unset_" -# @var bitwardenrs_ldap_bind_password: $ "_unset_" -# @var bitwardenrs_ldap_search_base_dn: $ "_unset_" -bitwardenrs_ldap_search_filter: "(&(objectclass=*)(uid=*))" -bitwardenrs_ldap_mail_field: "mail" -bitwardenrs_ldap_sync_interval_seconds: 60 -bitwardenrs_ldap_sync_loop: True +vaultwarden_ldap_vaultwarden_url: vaultwarden.example.com +vaultwarden_ldap_vaultwarden_admin_token: abc123 +# @var vaultwarden_ldap_host: $ "_unset_" +# @var vaultwarden_ldap_scheme: $ "_unset_" +vaultwarden_ldap_ssl: True +# @var vaultwarden_ldap_port: $ "_unset_" +# @var vaultwarden_ldap_bind_dn: $ "_unset_" +# @var vaultwarden_ldap_bind_password: $ "_unset_" +# @var vaultwarden_ldap_search_base_dn: $ "_unset_" +vaultwarden_ldap_search_filter: "(&(objectclass=*)(uid=*))" +vaultwarden_ldap_mail_field: "mail" +vaultwarden_ldap_sync_interval_seconds: 60 +vaultwarden_ldap_sync_loop: True diff --git a/meta/main.yml b/meta/main.yml index bfba1e6..553267b 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,16 +4,16 @@ galaxy_info: # @meta author:value: [Robert Kaussow](https://gitea.rknet.org/xoxys) author: Robert Kaussow namespace: xoxys - role_name: bitwardenrs_ldap_docker + role_name: vaultwarden_ldap_docker # @meta description: > - # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.bitwardenrs_ldap_docker) - # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.bitwardenrs_ldap_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.bitwardenrs_ldap_docker) - # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.bitwardenrs_ldap_docker/src/branch/master/LICENSE) + # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.vaultwarden_ldap_docker) + # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.vaultwarden_ldap_docker?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.vaultwarden_ldap_docker) + # [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/ansible/xoxys.vaultwarden_ldap_docker/src/branch/master/LICENSE) # - # Role to setup a [BitwardenRS LDAP](https://gitea.rknet.org/docker/bitwarden_rs_ldap) Sync Service - # for [BitwardenRS](https://github.com/dani-garcia/bitwarden_rs) password safe. + # Role to setup a [Vaultwarden LDAP](https://gitea.rknet.org/docker/vaultwarden-ldap) Sync Service + # for [Vaultwarden](https://github.com/dani-garcia/vaultwarden) password safe. # @end - description: Role to setup Bitwarden passsword safe + description: Role to setup a Vaultwarden LDAP Sync Service for Vaultwarden password safe. license: MIT min_ansible_version: 2.10 platforms: diff --git a/molecule/centos7/converge.yml b/molecule/centos7/converge.yml index 4269c07..7d2c42d 100644 --- a/molecule/centos7/converge.yml +++ b/molecule/centos7/converge.yml @@ -9,13 +9,13 @@ - python-pip - python-virtualenv dockerengine_networks: - - name: bitwardenrs_default - bitwardenrs_ldap_service_stopped: True - bitwardenrs_ldap_host: ldap.example.com - bitwardenrs_ldap_bind_dn: "uid=dummy,cn=users,dc=example,dc=com" - bitwardenrs_ldap_bind_password: dummy - bitwardenrs_ldap_search_base_dn: "ou=Users,dc=example,dc=com" + - name: vaultwarden_default + vaultwarden_ldap_service_stopped: True + vaultwarden_ldap_host: ldap.example.com + vaultwarden_ldap_bind_dn: "uid=dummy,cn=users,dc=example,dc=com" + vaultwarden_ldap_bind_password: dummy + vaultwarden_ldap_search_base_dn: "ou=Users,dc=example,dc=com" roles: - role: xoxys.docker_engine - - role: xoxys.bitwardenrs_ldap_docker + - role: xoxys.vaultwarden_ldap_docker diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml index e2efa3e..e5415a1 100644 --- a/molecule/centos7/molecule.yml +++ b/molecule/centos7/molecule.yml @@ -9,7 +9,7 @@ dependency: driver: name: delegated platforms: - - name: centos7-bitwardenrs-ldap + - name: centos7-vaultwarden-ldap image: centos-7 server_type: cx11 lint: | diff --git a/molecule/centos7/tests/test_default.py b/molecule/centos7/tests/test_default.py index e3e0569..d26149b 100644 --- a/molecule/centos7/tests/test_default.py +++ b/molecule/centos7/tests/test_default.py @@ -9,6 +9,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') -def test_bitwardenrs_ldap_compose_file(host): - f = host.file('/var/lib/docker/services/bitwardenrs_ldap/docker-compose.yml') +def test_vaultwarden_ldap_compose_file(host): + f = host.file('/var/lib/docker/services/vaultwarden_ldap/docker-compose.yml') assert f.exists diff --git a/tasks/setup.yml b/tasks/setup.yml index dc65c29..e03af23 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -2,14 +2,14 @@ - block: - name: Ensure service directory exists file: - path: "{{ bitwardenrs_ldap_service_directory }}" + path: "{{ vaultwarden_ldap_service_directory }}" state: directory mode: 0755 - - name: Deploy compose file to '{{ bitwardenrs_ldap_service_directory }}' + - name: Deploy compose file to '{{ vaultwarden_ldap_service_directory }}' template: - src: "services/bitwardenrs_ldap_compose.yml.j2" - dest: "{{ bitwardenrs_ldap_service_directory }}/docker-compose.yml" + src: "services/vaultwarden_ldap_compose.yml.j2" + dest: "{{ vaultwarden_ldap_service_directory }}/docker-compose.yml" owner: root group: root mode: 0640 @@ -17,10 +17,10 @@ - name: Ensure service is up and running docker_compose: - project_src: "{{ bitwardenrs_ldap_service_directory }}" + project_src: "{{ vaultwarden_ldap_service_directory }}" pull: yes remove_orphans: yes - stopped: "{{ bitwardenrs_ldap_service_stopped }}" + stopped: "{{ vaultwarden_ldap_service_stopped }}" state: present become: True become_user: root diff --git a/templates/services/bitwardenrs_ldap_compose.yml.j2 b/templates/services/bitwardenrs_ldap_compose.yml.j2 index 86254c8..b220d12 100644 --- a/templates/services/bitwardenrs_ldap_compose.yml.j2 +++ b/templates/services/bitwardenrs_ldap_compose.yml.j2 @@ -3,74 +3,74 @@ version: "2.4" services: - bitwardenrs_ldap: - container_name: {{ bitwardenrs_ldap_container_name }} - image: {{ bitwardenrs_ldap_image }} - restart: {{ bitwardenrs_ldap_restart_policy }} - {% if bitwardenrs_ldap_volumes | default([]) %} + vaultwarden_ldap: + container_name: {{ vaultwarden_ldap_container_name }} + image: {{ vaultwarden_ldap_image }} + restart: {{ vaultwarden_ldap_restart_policy }} + {% if vaultwarden_ldap_volumes | default([]) %} volumes: - {% for volume in bitwardenrs_ldap_volumes %} + {% for volume in vaultwarden_ldap_volumes %} - "{{ volume.name }}:{{ volume.dest }}" {% endfor %} {% endif %} - {% if bitwardenrs_ldap_networks_applied | default([]) %} + {% if vaultwarden_ldap_networks_applied | default([]) %} networks: - {% for network in bitwardenrs_ldap_networks_applied %} + {% for network in vaultwarden_ldap_networks_applied %} - {{ network }} {% endfor %} {% endif %} environment: - - BITWARDENRS_LDAP_BITWARDEN_URL={{ bitwardenrs_ldap_bitwarden_url }} - - BITWARDENRS_LDAP_BITWARDEN_ADMIN_TOKEN={{ bitwardenrs_ldap_bitwarden_admin_token }} - - BITWARDENRS_LDAP_HOST={{ bitwardenrs_ldap_host }} - {% if bitwardenrs_ldap_scheme is defined and bitwardenrs_ldap_scheme %} - - BITWARDENRS_LDAP_SCHEME={{ bitwardenrs_ldap_scheme }} + - VAULTWARDEN_LDAP_VAULTWARDEN_URL={{ vaultwarden_ldap_vaultwarden_url }} + - VAULTWARDEN_LDAP_VAULTWARDEN_ADMIN_TOKEN={{ vaultwarden_ldap_vaultwarden_admin_token }} + - VAULTWARDEN_LDAP_HOST={{ vaultwarden_ldap_host }} + {% if vaultwarden_ldap_scheme is defined and vaultwarden_ldap_scheme %} + - VAULTWARDEN_LDAP_SCHEME={{ vaultwarden_ldap_scheme }} {% endif %} - - BITWARDENRS_LDAP_SSL={{ bitwardenrs_ldap_ssl }} - {% if bitwardenrs_ldap_port is defined and bitwardenrs_ldap_port %} - - BITWARDENRS_LDAP_PORT={{ bitwardenrs_ldap_port }} + - VAULTWARDEN_LDAP_SSL={{ vaultwarden_ldap_ssl }} + {% if vaultwarden_ldap_port is defined and vaultwarden_ldap_port %} + - VAULTWARDEN_LDAP_PORT={{ vaultwarden_ldap_port }} {% endif %} - - BITWARDENRS_LDAP_BIND_DN={{ bitwardenrs_ldap_bind_dn }} - - BITWARDENRS_LDAP_BIND_PASSWORD={{ bitwardenrs_ldap_bind_password }} - - BITWARDENRS_LDAP_SEARCH_BASE_DN={{ bitwardenrs_ldap_search_base_dn }} - - BITWARDENRS_LDAP_SEARCH_FILTER={{ bitwardenrs_ldap_search_filter }} - - BITWARDENRS_LDAP_MAIL_FIELD={{ bitwardenrs_ldap_mail_field }} - - BITWARDENRS_LDAP_SYNC_INTERVAL_SECONDS={{ bitwardenrs_ldap_sync_interval_seconds }} - - BITWARDENRS_LDAP_SYNC_LOOP={{ bitwardenrs_ldap_sync_loop }} - {% if bitwardenrs_ldap_memory_limit is defined %} - mem_limit: {{ bitwardenrs_ldap_memory_limit }} + - VAULTWARDEN_LDAP_BIND_DN={{ vaultwarden_ldap_bind_dn }} + - VAULTWARDEN_LDAP_BIND_PASSWORD={{ vaultwarden_ldap_bind_password }} + - VAULTWARDEN_LDAP_SEARCH_BASE_DN={{ vaultwarden_ldap_search_base_dn }} + - VAULTWARDEN_LDAP_SEARCH_FILTER={{ vaultwarden_ldap_search_filter }} + - VAULTWARDEN_LDAP_MAIL_FIELD={{ vaultwarden_ldap_mail_field }} + - VAULTWARDEN_LDAP_SYNC_INTERVAL_SECONDS={{ vaultwarden_ldap_sync_interval_seconds }} + - VAULTWARDEN_LDAP_SYNC_LOOP={{ vaultwarden_ldap_sync_loop }} + {% if vaultwarden_ldap_memory_limit is defined %} + mem_limit: {{ vaultwarden_ldap_memory_limit }} {% endif %} - {% if bitwardenrs_ldap_memory_reservation is defined %} - mem_reservation: {{ bitwardenrs_ldap_memory_reservation }} + {% if vaultwarden_ldap_memory_reservation is defined %} + mem_reservation: {{ vaultwarden_ldap_memory_reservation }} {% endif %} - {% if bitwardenrs_ldap_cpu_shares is defined %} - cpu_shares: {{ bitwardenrs_ldap_cpu_shares }} + {% if vaultwarden_ldap_cpu_shares is defined %} + cpu_shares: {{ vaultwarden_ldap_cpu_shares }} {% endif %} - {% if not bitwardenrs_ldap_cap_add | length == 0 %} + {% if not vaultwarden_ldap_cap_add | length == 0 %} cap_add: - {% for item in bitwardenrs_ldap_cap_add %} + {% for item in vaultwarden_ldap_cap_add %} - {{ item }} {% endfor %} {% endif %} - {% if not bitwardenrs_ldap_cap_drop | length == 0 %} + {% if not vaultwarden_ldap_cap_drop | length == 0 %} cap_drop: - {% for item in bitwardenrs_ldap_cap_drop %} + {% for item in vaultwarden_ldap_cap_drop %} - {{ item }} {% endfor %} {% endif %} - {% if not bitwardenrs_ldap_security_opt | length == 0 %} + {% if not vaultwarden_ldap_security_opt | length == 0 %} security_opt: - {% for item in bitwardenrs_ldap_security_opt %} + {% for item in vaultwarden_ldap_security_opt %} - {{ item }} {% endfor %} {% endif %} - {% if bitwardenrs_ldap_pids_limit is defined %} - pids_limit: {{ bitwardenrs_ldap_pids_limit }} + {% if vaultwarden_ldap_pids_limit is defined %} + pids_limit: {{ vaultwarden_ldap_pids_limit }} {% endif %} -{% if bitwardenrs_ldap_networks | default([]) | length > 0 %} +{% if vaultwarden_ldap_networks | default([]) | length > 0 %} networks: - {% for network in bitwardenrs_ldap_networks %} + {% for network in vaultwarden_ldap_networks %} {{ network.name }}: {% if network.external | default(False) | bool %} external: true