From e6dabc80677b080dabfd0f587aa3570f1a6997a9 Mon Sep 17 00:00:00 2001
From: Simon Belbeoch <39310468+LiquidITGuy@users.noreply.github.com>
Date: Wed, 21 Apr 2021 02:18:19 +0200
Subject: [PATCH] Upgrade bitwarden_rs from 1.15.1 to 1.20.0 (#397)

* upgrade strapi to 3.5.4

* upgrade bitwarden_rs from 1.15.1 to 1.20.0 + better config

* fix typo

Co-authored-by: Simon Belbeoch <simon.belbeoch@octo.com>
---
 public/v4/apps/bitwardenrs.yml | 35 ++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/public/v4/apps/bitwardenrs.yml b/public/v4/apps/bitwardenrs.yml
index 23fe575..e34c15d 100644
--- a/public/v4/apps/bitwardenrs.yml
+++ b/public/v4/apps/bitwardenrs.yml
@@ -2,22 +2,45 @@ captainVersion: 4
 services:
     $$cap_appname:
         image: bitwardenrs/server:$$cap_bitwardenrs_version
+        environment:
+            DOMAIN: https://$$cap_appname.$$cap_root_domain
+            WEBSOCKET_ENABLED: true
+            SIGNUPS_ALLOWED: $$cap_register_enabled
+            ADMIN_TOKEN: $$cap_admin_token
+        ports:
+            - 3012:3012
         volumes:
             - $$cap_appname-data:/data
-        restart: always
+        restart: unless-stopped
 caproverOneClickApp:
     variables:
         - id: $$cap_bitwardenrs_version
           label: Bitwarden_rs Version
-          defaultValue: 1.15.1
+          defaultValue: 1.20.0
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/bitwardenrs/server/tags
           validRegex: /^([^\s^\/])+$/
+        - id: $$cap_register_enabled
+          label: enabled open registration
+          defaultValue: true
+          description: If field is true, all visitors can create an account. If false, only the administrator can invite other users.
+          validRegex: /^(true|false)$/
+        - id: $$cap_admin_token
+          label: admin password
+          defaultValue:
+          description: this password enables the admin zone on /admin. If you let this password empty, the admin interface will be disabled and it will be the best safety option.
     instructions:
-        start: This is a Bitwarden server API implementation written in Rust compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.
-        end: >-
-            Bitwarden_rs is deployed and available as $$cap_appname. Please give it a few minutes to boot, otherwise you will see a 502 error.
+        start: >-
+            This is a Bitwarden server API implementation written in Rust compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.
 
-            Please activate https and https redirect otherwise you will have error on account creation.
+            This project is not associated with the Bitwarden project nor 8bit Solutions LLC.
+
+            if you want more details please go to https://www.reddit.com/r/selfhosted/comments/fvld0n/bitwarden_vs_bitwarden_rs/
+        end: >-
+            Bitwarden_rs is deployed and available as $$cap_appname. Please give it a few minutes to boot, otherwise you will see a 502 error (even if the logs say it's working).
+
+            Please activate https and https redirect otherwise you will have an error on account creation. You need to enable websocket too.
+
+            If you enabled the admin token please go to https://$$cap_appname.$$cap_root_domain/admin to begin
     displayName: Bitwarden_rs
     isOfficial: true
     description: Lightweight fully featured Rust implementation of Bitwarden.