refactor: use project name globally // use underscores instead of minus
parent
cf32312fee
commit
4c751ac7d0
|
@ -4,4 +4,4 @@ bitwarden_image: vaultwarden/server
|
|||
bitwarden_version: 1.30.3-alpine
|
||||
bitwarden_port_web: 80
|
||||
bitwarden_port_ws: 3021
|
||||
bitwarden_service_name: bitwarden-{{ bitwarden_project }}
|
||||
bitwarden_service_name: bitwarden_{{ bitwarden_project }}
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
galaxy_info:
|
||||
role_name: bitwarden
|
||||
author: thiuda
|
||||
description: Role to deploy bitwarden behind a Nginx reverse proxy
|
||||
company: progressivwerk
|
||||
license: MIT
|
||||
min_ansible_version: '2.1'
|
||||
min_ansible_version: "2.1"
|
||||
galaxy_tags: [password, vault, bitwarden, nginx, reverse proxy]
|
||||
platforms:
|
||||
- name: Debian
|
||||
|
|
|
@ -1,25 +1,25 @@
|
|||
- name: "Create {{ bitwarden_domain }} directory if it does not exists"
|
||||
- name: "Create {{ bitwarden_service_name }} directory if it does not exists"
|
||||
become: true
|
||||
file:
|
||||
path: "{{ compose_dir }}/{{ bitwarden_domain }}"
|
||||
path: "{{ compose_dir }}/{{ bitwarden_service_name }}"
|
||||
state: directory
|
||||
mode: 0755
|
||||
- name: "Place docker-compose file to {{ bitwarden_domain }}/docker-compose.yml"
|
||||
- name: "Place docker-compose file to {{ bitwarden_service_name }}/docker-compose.yml"
|
||||
become: true
|
||||
template:
|
||||
src: templates/docker-compose.yml.j2
|
||||
dest: "{{ compose_dir }}/{{ bitwarden_domain }}/docker-compose.yml"
|
||||
dest: "{{ compose_dir }}/{{ bitwarden_service_name }}/docker-compose.yml"
|
||||
mode: 0700
|
||||
- name: "Place bitwarden env file {{ bitwarden_domain }}/.env"
|
||||
- name: "Place bitwarden env file {{ bitwarden_service_name }}/.env"
|
||||
become: true
|
||||
template:
|
||||
src: templates/.env.j2
|
||||
dest: "{{ compose_dir }}/{{ bitwarden_domain }}/.env"
|
||||
dest: "{{ compose_dir }}/{{ bitwarden_service_name }}/.env"
|
||||
mode: 0600
|
||||
- name: Update and start services
|
||||
become: true
|
||||
docker_compose:
|
||||
project_src: "{{ compose_dir }}/{{ bitwarden_domain }}"
|
||||
project_src: "{{ compose_dir }}/{{ bitwarden_service_name }}"
|
||||
pull: true
|
||||
state: present
|
||||
remove_orphans: true
|
||||
|
@ -27,11 +27,11 @@
|
|||
- name: Check all containers are running
|
||||
assert:
|
||||
that:
|
||||
- "output.ansible_facts.bitwarden.bitwarden.state.running": true
|
||||
- "output.ansible_facts.{{ bitwarden_service_name }}.{{ bitwarden_service_name }}.state.running": true
|
||||
- name: Place reverse proxy conf
|
||||
become: true
|
||||
template:
|
||||
src: templates/reverse_proxy.conf.j2
|
||||
dest: "/etc/nginx/conf.d/{{ bitwarden_domain }}.conf"
|
||||
dest: "/etc/nginx/conf.d/{{ bitwarden_service_name }}.conf"
|
||||
mode: 0600
|
||||
notify: Check and Reload nginx
|
||||
|
|
|
@ -7,8 +7,8 @@ services:
|
|||
"{{ bitwarden_service_name }}":
|
||||
image: "{{ bitwarden_image }}:{{ bitwarden_version }}"
|
||||
restart: unless-stopped
|
||||
container_name: bitwarden
|
||||
hostname: bitwarden
|
||||
container_name: "{{ bitwarden_service_name }}"
|
||||
hostname: "{{ bitwarden_service_name }}"
|
||||
ports:
|
||||
- "127.0.0.1:{{ bitwarden_port_web }}:80"
|
||||
- "127.0.0.1:{{ bitwarden_port_ws }}:3021"
|
||||
|
@ -18,4 +18,4 @@ services:
|
|||
- ./.env
|
||||
volumes:
|
||||
data:
|
||||
name: "{{ bitwarden_service_name }}-data"
|
||||
name: "{{ bitwarden_service_name }}_data"
|
||||
|
|
Loading…
Reference in New Issue