Update bitwarden_rs to vaultwarden

I'll do the full rename of everything another time

ansible/main.yml

@@ -63,7 +63,7 @@
     - yourls
     - pve_nebula_route
     - privatebin
-    - bitwarden_rs
+    - vaultwarden
 
 - hosts: ingress
   roles:

ansible/roles/bitwarden_rs/files/docker-compose.yml

@@ -1,48 +0,0 @@
-version: "2.3"
-
-services:
-  bitwarden:
-    image: bitwardenrs/server:1.20.0-alpine
-    restart: unless-stopped
-    user: "{{ docker_user.id }}:{{ docker_user.id }}"
-    volumes:
-      - "{{ app_data_dir }}/bitwarden_rs/:/data"
-    depends_on:
-      - db
-    dns: 1.1.1.1
-    labels:
-      - traefik.enable=true
-
-      - traefik.http.routers.bitwarden-ui.rule=Host(`bw.jakehoward.tech`)
-      - traefik.http.routers.bitwarden-ui.service=bitwarden-ui
-      - traefik.http.services.bitwarden-ui.loadbalancer.server.port=80
-      - traefik.http.routers.bitwarden-ui.tls.certresolver=le
-
-      - traefik.http.routers.bitwarden-websocket.rule=Host(`bw.jakehoward.tech`) && Path(`/notifications/hub`)
-      - traefik.http.routers.bitwarden-websocket.service=bitwarden-websocket
-      - traefik.http.services.bitwarden-websocket.loadbalancer.server.port=3012
-      - traefik.http.routers.bitwarden-websocket.tls.certresolver=le
-
-      - traefik.http.middlewares.bw-ratelimit.ratelimit.average=5
-      - traefik.http.middlewares.bw-ratelimit.ratelimit.burst=1000
-      - traefik.http.middlewares.bw-compress.compress=true
-
-      - traefik.http.routers.bitwarden-ui.middlewares=bw-ratelimit,bw-compress
-      - traefik.http.routers.bitwarden-websocket.middlewares=bw-ratelimit,bw-compress
-    environment:
-      - SIGNUPS_ALLOWED=false
-      - DOMAIN=https://bw.jakehoward.tech
-      - SHOW_PASSWORD_HINT=false
-      - DATABASE_URL=postgres://bitwarden:{{ bitwarden_database_password }}@db/bitwarden
-      - INVITATIONS_ALLOWED=false
-      - ROCKET_WORKERS={{ ansible_processor_nproc }}
-      - WEBSOCKET_ENABLED=true
-
-  db:
-    image: postgres:12-alpine
-    restart: unless-stopped
-    volumes:
-      - /mnt/tank/dbs/postgres/bitwarden_rs/:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD={{ bitwarden_database_password }}
-      - POSTGRES_USER=bitwarden

ansible/roles/bitwarden_rs/handlers/main.yml

@@ -1,4 +0,0 @@
-- name: restart bitwarden_rs
-  shell:
-    chdir: /opt/bitwarden_rs
-    cmd: "{{ docker_update_command }}"

ansible/roles/vaultwarden/files/docker-compose.yml

@@ -0,0 +1,48 @@
+version: "2.3"
+
+services:
+  vaultwarden:
+    image: vaultwarden/server:1.21.0-alpine
+    restart: unless-stopped
+    user: "{{ docker_user.id }}:{{ docker_user.id }}"
+    volumes:
+      - "{{ app_data_dir }}/vaultwarden/:/data"
+    depends_on:
+      - db
+    dns: 1.1.1.1
+    labels:
+      - traefik.enable=true
+
+      - traefik.http.routers.vaultwarden-ui.rule=Host(`bw.jakehoward.tech`)
+      - traefik.http.routers.vaultwarden-ui.service=vaultwarden-ui
+      - traefik.http.services.vaultwarden-ui.loadbalancer.server.port=80
+      - traefik.http.routers.vaultwarden-ui.tls.certresolver=le
+
+      - traefik.http.routers.vaultwarden-websocket.rule=Host(`bw.jakehoward.tech`) && Path(`/notifications/hub`)
+      - traefik.http.routers.vaultwarden-websocket.service=vaultwarden-websocket
+      - traefik.http.services.vaultwarden-websocket.loadbalancer.server.port=3012
+      - traefik.http.routers.vaultwarden-websocket.tls.certresolver=le
+
+      - traefik.http.middlewares.vaultwarden-ratelimit.ratelimit.average=5
+      - traefik.http.middlewares.vaultwarden-ratelimit.ratelimit.burst=1000
+      - traefik.http.middlewares.vaultwarden-compress.compress=true
+
+      - traefik.http.routers.vaultwarden-ui.middlewares=vaultwarden-ratelimit,vaultwarden-compress
+      - traefik.http.routers.vaultwarden-websocket.middlewares=vaultwarden-ratelimit,vaultwarden-compress
+    environment:
+      - SIGNUPS_ALLOWED=false
+      - DOMAIN=https://bw.jakehoward.tech
+      - SHOW_PASSWORD_HINT=false
+      - DATABASE_URL=postgres://bitwarden:{{ bitwarden_database_password }}@db/bitwarden
+      - INVITATIONS_ALLOWED=false
+      - ROCKET_WORKERS={{ ansible_processor_nproc }}
+      - WEBSOCKET_ENABLED=true
+
+  db:
+    image: postgres:12-alpine
+    restart: unless-stopped
+    volumes:
+      - /mnt/tank/dbs/postgres/vaultwarden/:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD={{ bitwarden_database_password }}
+      - POSTGRES_USER=bitwarden

ansible/roles/vaultwarden/handlers/main.yml

@@ -0,0 +1,4 @@
+- name: restart vaultwarden
+  shell:
+    chdir: /opt/vaultwarden
+    cmd: "{{ docker_update_command }}"

ansible/roles/vaultwarden/tasks/main.yml

@@ -1,6 +1,6 @@
 - name: Create install directory
   file:
-    path: /opt/bitwarden_rs
+    path: /opt/vaultwarden
     state: directory
     owner: "{{ docker_user.name }}"
     mode: "{{ docker_compose_directory_mask }}"
@@ -9,9 +9,9 @@
 - name: Install compose file
   template:
     src: files/docker-compose.yml
-    dest: /opt/bitwarden_rs/docker-compose.yml
+    dest: /opt/vaultwarden/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
     validate: docker-compose -f %s config
-  notify: restart bitwarden_rs
+  notify: restart vaultwarden
   become: true