From 4c751ac7d03b327aeaf19a725845ba5a9479ecac Mon Sep 17 00:00:00 2001
From: thiuda <thiuda@mailbox.org>
Date: Sat, 17 Feb 2024 16:51:25 +0100
Subject: [PATCH] refactor: use project name globally // use underscores
 instead of minus

---
 defaults/main.yml               |  2 +-
 meta/main.yml                   |  3 ++-
 tasks/main.yml                  | 18 +++++++++---------
 templates/docker-compose.yml.j2 |  6 +++---
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 409379a..0d48381 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -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 }}
diff --git a/meta/main.yml b/meta/main.yml
index afa07ad..438e310 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -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
diff --git a/tasks/main.yml b/tasks/main.yml
index 59dfc73..544b1b8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -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
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index acd7332..1505b14 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -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"