From cd115671642479f946e2e2d250ad3631828b3a5c Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <kris@lamoureux.io>
Date: Thu, 19 May 2022 23:19:09 -0400
Subject: [PATCH] Fix broken Bitwarden provision

---
 Vagrantfile                                       | 3 ++-
 roles/bitwarden/defaults/main.yml                 | 1 +
 roles/bitwarden/tasks/main.yml                    | 2 +-
 roles/bitwarden/templates/bw_wrapper.j2           | 3 +++
 roles/bitwarden/templates/compose.override.yml.j2 | 2 ++
 roles/traefik/handlers/main.yml                   | 1 +
 roles/traefik/tasks/main.yml                      | 1 +
 7 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 6dd7935..2cb6065 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,8 +30,9 @@ Vagrant.configure("2") do |config|
   config.vm.define :moxie do |moxie| #
   end
 
-  # Disable Machine Name Prefix
   config.vm.provider :libvirt do |libvirt|
+    libvirt.cpus = 2
+    libvirt.memory = 4096
     libvirt.default_prefix = ""
   end
 
diff --git a/roles/bitwarden/defaults/main.yml b/roles/bitwarden/defaults/main.yml
index 80d6cc5..da91560 100644
--- a/roles/bitwarden/defaults/main.yml
+++ b/roles/bitwarden/defaults/main.yml
@@ -1,4 +1,5 @@
 bitwarden_name: bitwarden
 bitwarden_root: "/opt/{{ bitwarden_name }}"
+bitwarden_database: "{{ bitwarden_name }}"
 bitwarden_standalone: false
 bitwarden_production: false
diff --git a/roles/bitwarden/tasks/main.yml b/roles/bitwarden/tasks/main.yml
index 2b66848..7c5d06d 100644
--- a/roles/bitwarden/tasks/main.yml
+++ b/roles/bitwarden/tasks/main.yml
@@ -11,7 +11,7 @@
 - name: Download Bitwarden script
   get_url:
     url: "https://raw.githubusercontent.com/\
-          bitwarden/server/master/scripts/bitwarden.sh"
+          bitwarden/self-host/master/bitwarden.sh"
     dest: "{{ bitwarden_root }}"
     mode: u+x
 
diff --git a/roles/bitwarden/templates/bw_wrapper.j2 b/roles/bitwarden/templates/bw_wrapper.j2
index 126b14c..752ae85 100644
--- a/roles/bitwarden/templates/bw_wrapper.j2
+++ b/roles/bitwarden/templates/bw_wrapper.j2
@@ -14,6 +14,9 @@ send "y\r"
 send "n\r"
 {% endif %}
 
+expect "Enter the database name for your Bitwarden instance (ex. vault):"
+send "{{ bitwarden_database }}\r"
+
 expect "Enter your installation id (get at https://bitwarden.com/host):"
 send "{{ bitwarden_install_id }}\r"
 
diff --git a/roles/bitwarden/templates/compose.override.yml.j2 b/roles/bitwarden/templates/compose.override.yml.j2
index aef4263..eaa6b01 100644
--- a/roles/bitwarden/templates/compose.override.yml.j2
+++ b/roles/bitwarden/templates/compose.override.yml.j2
@@ -1,3 +1,5 @@
+version: '3'
+
 services:
   nginx:
     networks:
diff --git a/roles/traefik/handlers/main.yml b/roles/traefik/handlers/main.yml
index 6fb908f..eeaca65 100644
--- a/roles/traefik/handlers/main.yml
+++ b/roles/traefik/handlers/main.yml
@@ -9,5 +9,6 @@
     name: "{{ traefik_name }}"
     image: traefik:{{ traefik_version }}
     state: started
+    container_default_behavior: "no_defaults"
     restart: yes
   listen: restart_traefik
diff --git a/roles/traefik/tasks/main.yml b/roles/traefik/tasks/main.yml
index dd5348a..a242a92 100644
--- a/roles/traefik/tasks/main.yml
+++ b/roles/traefik/tasks/main.yml
@@ -36,6 +36,7 @@
     state: started
     restart_policy: always
     ports: "{{ traefik_ports }}"
+    container_default_behavior: "no_defaults"
     networks_cli_compatible: "false"
     networks:
       - name: traefik