chore: upstream project was renamed to vaultwarden (#1)
Some checks failed
continuous-integration/drone/push Build is failing

Co-authored-by: Robert Kaussow <mail@geeklabor.de>
Reviewed-on: #1
Co-authored-by: Robert Kaussow <xoxys@rknet.org>
Co-committed-by: Robert Kaussow <xoxys@rknet.org>
This commit is contained in:
Robert Kaussow 2021-05-15 22:09:29 +02:00
parent a08cf1e71b
commit 4fb938c103
8 changed files with 105 additions and 105 deletions

View File

@ -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) [![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 ## License

View File

@ -1,29 +1,29 @@
--- ---
bitwardenrs_ldap_version: latest vaultwarden_ldap_version: latest
bitwardenrs_ldap_image: "thegeeklab/bitwardenrs_ldap:{{ bitwardenrs_ldap_version }}" vaultwarden_ldap_image: "thegeeklab/vaultwarden_ldap:{{ vaultwarden_ldap_version }}"
bitwardenrs_ldap_service_directory: /var/lib/docker/services/bitwardenrs_ldap vaultwarden_ldap_service_directory: /var/lib/docker/services/vaultwarden_ldap
bitwardenrs_ldap_container_name: bitwardenrs_ldap vaultwarden_ldap_container_name: vaultwarden_ldap
bitwardenrs_ldap_restart_policy: always vaultwarden_ldap_restart_policy: always
bitwardenrs_ldap_service_stopped: False vaultwarden_ldap_service_stopped: False
# @var bitwardenrs_ldap_networks:example: > # @var vaultwarden_ldap_networks:example: >
# bitwardenrs_ldap_networks: # vaultwarden_ldap_networks:
# - name: default # - name: default
# # optional network driver, defaults to 'bride' # # optional network driver, defaults to 'bride'
# driver: host # driver: host
# @end # @end
bitwardenrs_ldap_networks: vaultwarden_ldap_networks:
- name: bitwardenrs_default - name: vaultwarden_default
external: True external: True
bitwardenrs_ldap_networks_applied: vaultwarden_ldap_networks_applied:
- bitwardenrs_default - vaultwarden_default
# @var bitwardenrs_ldap_volumes:description: > Define required docker volumes. # @var vaultwarden_ldap_volumes:description: > Define required docker volumes.
# @end # @end
# @var bitwardenrs_ldap_volumes:example: > # @var vaultwarden_ldap_volumes:example: >
# bitwardenrs_ldap_volumes: # vaultwarden_ldap_volumes:
# # Instead of the name you could specify a path on the container host system, # # 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 # # but you also have to enable bind mount for this volume
# - name: data # - name: data
@ -33,30 +33,30 @@ bitwardenrs_ldap_networks_applied:
# # keep in mind you MUST set bind in any case # # keep in mind you MUST set bind in any case
# bind: True # bind: True
# @end # @end
bitwardenrs_ldap_volumes: [] vaultwarden_ldap_volumes: []
# @var bitwardenrs_ldap_memory_limit: $ "_unset_" # @var vaultwarden_ldap_memory_limit: $ "_unset_"
# @var bitwardenrs_ldap_memory_limit:example: $ "512m" # @var vaultwarden_ldap_memory_limit:example: $ "512m"
# @var bitwardenrs_ldap_memory_reservation: $ "_unset_" # @var vaultwarden_ldap_memory_reservation: $ "_unset_"
# @var bitwardenrs_ldap_memory_reservation:example: $ "256m" # @var vaultwarden_ldap_memory_reservation:example: $ "256m"
# @var bitwardenrs_ldap_cpu_shares: $ "_unset_" # @var vaultwarden_ldap_cpu_shares: $ "_unset_"
# @var bitwardenrs_ldap_cpu_shares:example: $ "1024" # @var vaultwarden_ldap_cpu_shares:example: $ "1024"
bitwardenrs_ldap_cap_add: [] vaultwarden_ldap_cap_add: []
bitwardenrs_ldap_cap_drop: [] vaultwarden_ldap_cap_drop: []
bitwardenrs_ldap_security_opt: [] vaultwarden_ldap_security_opt: []
# @var bitwardenrs_ldap_pids_limit: $ "_unset_" # @var vaultwarden_ldap_pids_limit: $ "_unset_"
bitwardenrs_ldap_bitwarden_url: bitwarden.example.com vaultwarden_ldap_vaultwarden_url: vaultwarden.example.com
bitwardenrs_ldap_bitwarden_admin_token: abc123 vaultwarden_ldap_vaultwarden_admin_token: abc123
# @var bitwardenrs_ldap_host: $ "_unset_" # @var vaultwarden_ldap_host: $ "_unset_"
# @var bitwardenrs_ldap_scheme: $ "_unset_" # @var vaultwarden_ldap_scheme: $ "_unset_"
bitwardenrs_ldap_ssl: True vaultwarden_ldap_ssl: True
# @var bitwardenrs_ldap_port: $ "_unset_" # @var vaultwarden_ldap_port: $ "_unset_"
# @var bitwardenrs_ldap_bind_dn: $ "_unset_" # @var vaultwarden_ldap_bind_dn: $ "_unset_"
# @var bitwardenrs_ldap_bind_password: $ "_unset_" # @var vaultwarden_ldap_bind_password: $ "_unset_"
# @var bitwardenrs_ldap_search_base_dn: $ "_unset_" # @var vaultwarden_ldap_search_base_dn: $ "_unset_"
bitwardenrs_ldap_search_filter: "(&(objectclass=*)(uid=*))" vaultwarden_ldap_search_filter: "(&(objectclass=*)(uid=*))"
bitwardenrs_ldap_mail_field: "mail" vaultwarden_ldap_mail_field: "mail"
bitwardenrs_ldap_sync_interval_seconds: 60 vaultwarden_ldap_sync_interval_seconds: 60
bitwardenrs_ldap_sync_loop: True vaultwarden_ldap_sync_loop: True

View File

@ -4,16 +4,16 @@ galaxy_info:
# @meta author:value: [Robert Kaussow](https://gitea.rknet.org/xoxys) # @meta author:value: [Robert Kaussow](https://gitea.rknet.org/xoxys)
author: Robert Kaussow <mail@thegeeklab.de> author: Robert Kaussow <mail@thegeeklab.de>
namespace: xoxys namespace: xoxys
role_name: bitwardenrs_ldap_docker role_name: vaultwarden_ldap_docker
# @meta description: > # @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) # [![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.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)](https://gitea.rknet.org/ansible/xoxys.bitwardenrs_ldap_docker/src/branch/master/LICENSE) # [![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 # Role to setup a [Vaultwarden LDAP](https://gitea.rknet.org/docker/vaultwarden-ldap) Sync Service
# for [BitwardenRS](https://github.com/dani-garcia/bitwarden_rs) password safe. # for [Vaultwarden](https://github.com/dani-garcia/vaultwarden) password safe.
# @end # @end
description: Role to setup Bitwarden passsword safe description: Role to setup a Vaultwarden LDAP Sync Service for Vaultwarden password safe.
license: MIT license: MIT
min_ansible_version: 2.10 min_ansible_version: 2.10
platforms: platforms:

View File

@ -9,13 +9,13 @@
- python-pip - python-pip
- python-virtualenv - python-virtualenv
dockerengine_networks: dockerengine_networks:
- name: bitwardenrs_default - name: vaultwarden_default
bitwardenrs_ldap_service_stopped: True vaultwarden_ldap_service_stopped: True
bitwardenrs_ldap_host: ldap.example.com vaultwarden_ldap_host: ldap.example.com
bitwardenrs_ldap_bind_dn: "uid=dummy,cn=users,dc=example,dc=com" vaultwarden_ldap_bind_dn: "uid=dummy,cn=users,dc=example,dc=com"
bitwardenrs_ldap_bind_password: dummy vaultwarden_ldap_bind_password: dummy
bitwardenrs_ldap_search_base_dn: "ou=Users,dc=example,dc=com" vaultwarden_ldap_search_base_dn: "ou=Users,dc=example,dc=com"
roles: roles:
- role: xoxys.docker_engine - role: xoxys.docker_engine
- role: xoxys.bitwardenrs_ldap_docker - role: xoxys.vaultwarden_ldap_docker

View File

@ -9,7 +9,7 @@ dependency:
driver: driver:
name: delegated name: delegated
platforms: platforms:
- name: centos7-bitwardenrs-ldap - name: centos7-vaultwarden-ldap
image: centos-7 image: centos-7
server_type: cx11 server_type: cx11
lint: | lint: |

View File

@ -9,6 +9,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
def test_bitwardenrs_ldap_compose_file(host): def test_vaultwarden_ldap_compose_file(host):
f = host.file('/var/lib/docker/services/bitwardenrs_ldap/docker-compose.yml') f = host.file('/var/lib/docker/services/vaultwarden_ldap/docker-compose.yml')
assert f.exists assert f.exists

View File

@ -2,14 +2,14 @@
- block: - block:
- name: Ensure service directory exists - name: Ensure service directory exists
file: file:
path: "{{ bitwardenrs_ldap_service_directory }}" path: "{{ vaultwarden_ldap_service_directory }}"
state: directory state: directory
mode: 0755 mode: 0755
- name: Deploy compose file to '{{ bitwardenrs_ldap_service_directory }}' - name: Deploy compose file to '{{ vaultwarden_ldap_service_directory }}'
template: template:
src: "services/bitwardenrs_ldap_compose.yml.j2" src: "services/vaultwarden_ldap_compose.yml.j2"
dest: "{{ bitwardenrs_ldap_service_directory }}/docker-compose.yml" dest: "{{ vaultwarden_ldap_service_directory }}/docker-compose.yml"
owner: root owner: root
group: root group: root
mode: 0640 mode: 0640
@ -17,10 +17,10 @@
- name: Ensure service is up and running - name: Ensure service is up and running
docker_compose: docker_compose:
project_src: "{{ bitwardenrs_ldap_service_directory }}" project_src: "{{ vaultwarden_ldap_service_directory }}"
pull: yes pull: yes
remove_orphans: yes remove_orphans: yes
stopped: "{{ bitwardenrs_ldap_service_stopped }}" stopped: "{{ vaultwarden_ldap_service_stopped }}"
state: present state: present
become: True become: True
become_user: root become_user: root

View File

@ -3,74 +3,74 @@
version: "2.4" version: "2.4"
services: services:
bitwardenrs_ldap: vaultwarden_ldap:
container_name: {{ bitwardenrs_ldap_container_name }} container_name: {{ vaultwarden_ldap_container_name }}
image: {{ bitwardenrs_ldap_image }} image: {{ vaultwarden_ldap_image }}
restart: {{ bitwardenrs_ldap_restart_policy }} restart: {{ vaultwarden_ldap_restart_policy }}
{% if bitwardenrs_ldap_volumes | default([]) %} {% if vaultwarden_ldap_volumes | default([]) %}
volumes: volumes:
{% for volume in bitwardenrs_ldap_volumes %} {% for volume in vaultwarden_ldap_volumes %}
- "{{ volume.name }}:{{ volume.dest }}" - "{{ volume.name }}:{{ volume.dest }}"
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if bitwardenrs_ldap_networks_applied | default([]) %} {% if vaultwarden_ldap_networks_applied | default([]) %}
networks: networks:
{% for network in bitwardenrs_ldap_networks_applied %} {% for network in vaultwarden_ldap_networks_applied %}
- {{ network }} - {{ network }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
environment: environment:
- BITWARDENRS_LDAP_BITWARDEN_URL={{ bitwardenrs_ldap_bitwarden_url }} - VAULTWARDEN_LDAP_VAULTWARDEN_URL={{ vaultwarden_ldap_vaultwarden_url }}
- BITWARDENRS_LDAP_BITWARDEN_ADMIN_TOKEN={{ bitwardenrs_ldap_bitwarden_admin_token }} - VAULTWARDEN_LDAP_VAULTWARDEN_ADMIN_TOKEN={{ vaultwarden_ldap_vaultwarden_admin_token }}
- BITWARDENRS_LDAP_HOST={{ bitwardenrs_ldap_host }} - VAULTWARDEN_LDAP_HOST={{ vaultwarden_ldap_host }}
{% if bitwardenrs_ldap_scheme is defined and bitwardenrs_ldap_scheme %} {% if vaultwarden_ldap_scheme is defined and vaultwarden_ldap_scheme %}
- BITWARDENRS_LDAP_SCHEME={{ bitwardenrs_ldap_scheme }} - VAULTWARDEN_LDAP_SCHEME={{ vaultwarden_ldap_scheme }}
{% endif %} {% endif %}
- BITWARDENRS_LDAP_SSL={{ bitwardenrs_ldap_ssl }} - VAULTWARDEN_LDAP_SSL={{ vaultwarden_ldap_ssl }}
{% if bitwardenrs_ldap_port is defined and bitwardenrs_ldap_port %} {% if vaultwarden_ldap_port is defined and vaultwarden_ldap_port %}
- BITWARDENRS_LDAP_PORT={{ bitwardenrs_ldap_port }} - VAULTWARDEN_LDAP_PORT={{ vaultwarden_ldap_port }}
{% endif %} {% endif %}
- BITWARDENRS_LDAP_BIND_DN={{ bitwardenrs_ldap_bind_dn }} - VAULTWARDEN_LDAP_BIND_DN={{ vaultwarden_ldap_bind_dn }}
- BITWARDENRS_LDAP_BIND_PASSWORD={{ bitwardenrs_ldap_bind_password }} - VAULTWARDEN_LDAP_BIND_PASSWORD={{ vaultwarden_ldap_bind_password }}
- BITWARDENRS_LDAP_SEARCH_BASE_DN={{ bitwardenrs_ldap_search_base_dn }} - VAULTWARDEN_LDAP_SEARCH_BASE_DN={{ vaultwarden_ldap_search_base_dn }}
- BITWARDENRS_LDAP_SEARCH_FILTER={{ bitwardenrs_ldap_search_filter }} - VAULTWARDEN_LDAP_SEARCH_FILTER={{ vaultwarden_ldap_search_filter }}
- BITWARDENRS_LDAP_MAIL_FIELD={{ bitwardenrs_ldap_mail_field }} - VAULTWARDEN_LDAP_MAIL_FIELD={{ vaultwarden_ldap_mail_field }}
- BITWARDENRS_LDAP_SYNC_INTERVAL_SECONDS={{ bitwardenrs_ldap_sync_interval_seconds }} - VAULTWARDEN_LDAP_SYNC_INTERVAL_SECONDS={{ vaultwarden_ldap_sync_interval_seconds }}
- BITWARDENRS_LDAP_SYNC_LOOP={{ bitwardenrs_ldap_sync_loop }} - VAULTWARDEN_LDAP_SYNC_LOOP={{ vaultwarden_ldap_sync_loop }}
{% if bitwardenrs_ldap_memory_limit is defined %} {% if vaultwarden_ldap_memory_limit is defined %}
mem_limit: {{ bitwardenrs_ldap_memory_limit }} mem_limit: {{ vaultwarden_ldap_memory_limit }}
{% endif %} {% endif %}
{% if bitwardenrs_ldap_memory_reservation is defined %} {% if vaultwarden_ldap_memory_reservation is defined %}
mem_reservation: {{ bitwardenrs_ldap_memory_reservation }} mem_reservation: {{ vaultwarden_ldap_memory_reservation }}
{% endif %} {% endif %}
{% if bitwardenrs_ldap_cpu_shares is defined %} {% if vaultwarden_ldap_cpu_shares is defined %}
cpu_shares: {{ bitwardenrs_ldap_cpu_shares }} cpu_shares: {{ vaultwarden_ldap_cpu_shares }}
{% endif %} {% endif %}
{% if not bitwardenrs_ldap_cap_add | length == 0 %} {% if not vaultwarden_ldap_cap_add | length == 0 %}
cap_add: cap_add:
{% for item in bitwardenrs_ldap_cap_add %} {% for item in vaultwarden_ldap_cap_add %}
- {{ item }} - {{ item }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if not bitwardenrs_ldap_cap_drop | length == 0 %} {% if not vaultwarden_ldap_cap_drop | length == 0 %}
cap_drop: cap_drop:
{% for item in bitwardenrs_ldap_cap_drop %} {% for item in vaultwarden_ldap_cap_drop %}
- {{ item }} - {{ item }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if not bitwardenrs_ldap_security_opt | length == 0 %} {% if not vaultwarden_ldap_security_opt | length == 0 %}
security_opt: security_opt:
{% for item in bitwardenrs_ldap_security_opt %} {% for item in vaultwarden_ldap_security_opt %}
- {{ item }} - {{ item }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if bitwardenrs_ldap_pids_limit is defined %} {% if vaultwarden_ldap_pids_limit is defined %}
pids_limit: {{ bitwardenrs_ldap_pids_limit }} pids_limit: {{ vaultwarden_ldap_pids_limit }}
{% endif %} {% endif %}
{% if bitwardenrs_ldap_networks | default([]) | length > 0 %} {% if vaultwarden_ldap_networks | default([]) | length > 0 %}
networks: networks:
{% for network in bitwardenrs_ldap_networks %} {% for network in vaultwarden_ldap_networks %}
{{ network.name }}: {{ network.name }}:
{% if network.external | default(False) | bool %} {% if network.external | default(False) | bool %}
external: true external: true