From 7791b8cdb93e6aab66002c928bc01dd49725af76 Mon Sep 17 00:00:00 2001 From: Stetsed Date: Sat, 21 May 2022 11:49:01 +0200 Subject: [PATCH 1/3] Add Vaultwarden App --- apps/vaultwarden/config.json | 21 +++++++++++++++++++++ apps/vaultwarden/docker-compose.yml | 16 ++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 apps/vaultwarden/config.json create mode 100644 apps/vaultwarden/docker-compose.yml diff --git a/apps/vaultwarden/config.json b/apps/vaultwarden/config.json new file mode 100644 index 00000000..029be6e0 --- /dev/null +++ b/apps/vaultwarden/config.json @@ -0,0 +1,21 @@ +{ + "name": "VaultWarden", + "available": true, + "port": 8107, + "id": "Vaultwarden", + "description": "Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.", + "short_desc": "All your passwords in your control!", + "author": "Stetsed", + "source": "https://github.com/dani-garcia/vaultwarden", + "image": "https://raw.githubusercontent.com/dani-garcia/vaultwarden/b636d20c6475bfb1b36561cb95812faee26ea7db/resources/vaultwarden-icon.svg", + "form_fields": { + "admin_password": { + "type": "password", + "label": "Admin Panel Password", + "max": 50, + "min": 10, + "required": true, + "env_variable": "VAULTWARDEN_ADMIN_PASSWORD" + } + } + } \ No newline at end of file diff --git a/apps/vaultwarden/docker-compose.yml b/apps/vaultwarden/docker-compose.yml new file mode 100644 index 00000000..187914f9 --- /dev/null +++ b/apps/vaultwarden/docker-compose.yml @@ -0,0 +1,16 @@ +version: '3' + +services: + vaultwarden: + image: vaultwarden/server + container_name: vaultwarden + restart: unless-stopped + ports: + - ${APP_PORT}:80 + networks: + - tipi_main_network + environment: + - WEBSOCKET_ENABLED=true + - ADMIN_TOKEN=$VAULTWARDEN_ADMIN_PASSWORD + volumes: + - ${APP_DATA_DIR}/data:/data From c79500bf9c9c8163b38e3f3ae1485793e61fb593 Mon Sep 17 00:00:00 2001 From: Stetsed <33891782+Stetsed@users.noreply.github.com> Date: Sun, 22 May 2022 23:30:27 +0200 Subject: [PATCH 2/3] Fix brackets --- apps/vaultwarden/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/vaultwarden/docker-compose.yml b/apps/vaultwarden/docker-compose.yml index 187914f9..0d9d8b03 100644 --- a/apps/vaultwarden/docker-compose.yml +++ b/apps/vaultwarden/docker-compose.yml @@ -11,6 +11,6 @@ services: - tipi_main_network environment: - WEBSOCKET_ENABLED=true - - ADMIN_TOKEN=$VAULTWARDEN_ADMIN_PASSWORD + - ADMIN_TOKEN=${VAULTWARDEN_ADMIN_PASSWORD} volumes: - ${APP_DATA_DIR}/data:/data From 0f62ec4c783395e8e82b1b4bed0d9ee04efb5eeb Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Mon, 23 May 2022 07:33:22 +0200 Subject: [PATCH 3/3] Update VaultWarden config --- apps/vaultwarden/config.json | 38 ++++++++++++++--------------- apps/vaultwarden/docker-compose.yml | 8 +++--- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/vaultwarden/config.json b/apps/vaultwarden/config.json index 029be6e0..c4eecdbc 100644 --- a/apps/vaultwarden/config.json +++ b/apps/vaultwarden/config.json @@ -1,21 +1,21 @@ { - "name": "VaultWarden", - "available": true, - "port": 8107, - "id": "Vaultwarden", - "description": "Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.", - "short_desc": "All your passwords in your control!", - "author": "Stetsed", - "source": "https://github.com/dani-garcia/vaultwarden", - "image": "https://raw.githubusercontent.com/dani-garcia/vaultwarden/b636d20c6475bfb1b36561cb95812faee26ea7db/resources/vaultwarden-icon.svg", - "form_fields": { - "admin_password": { - "type": "password", - "label": "Admin Panel Password", - "max": 50, - "min": 10, - "required": true, - "env_variable": "VAULTWARDEN_ADMIN_PASSWORD" - } + "name": "VaultWarden", + "available": true, + "port": 8107, + "id": "vaultwarden", + "description": "Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.", + "short_desc": "All your passwords in your control!", + "author": "Daniel García", + "source": "https://github.com/dani-garcia/vaultwarden", + "image": "https://raw.githubusercontent.com/dani-garcia/vaultwarden/b636d20c6475bfb1b36561cb95812faee26ea7db/resources/vaultwarden-icon.svg", + "form_fields": { + "admin_password": { + "type": "password", + "label": "Admin Panel Password", + "max": 50, + "min": 10, + "required": true, + "env_variable": "VAULTWARDEN_ADMIN_PASSWORD" } - } \ No newline at end of file + } +} diff --git a/apps/vaultwarden/docker-compose.yml b/apps/vaultwarden/docker-compose.yml index 0d9d8b03..e7b698ee 100644 --- a/apps/vaultwarden/docker-compose.yml +++ b/apps/vaultwarden/docker-compose.yml @@ -1,16 +1,16 @@ -version: '3' +version: '3.7' services: vaultwarden: - image: vaultwarden/server + image: vaultwarden/server:1.24.0 container_name: vaultwarden restart: unless-stopped ports: - ${APP_PORT}:80 - networks: - - tipi_main_network environment: - WEBSOCKET_ENABLED=true - ADMIN_TOKEN=${VAULTWARDEN_ADMIN_PASSWORD} volumes: - ${APP_DATA_DIR}/data:/data + networks: + - tipi_main_network