From 0fcb922409d39f96ded002efb6b4d3403a00f3f5 Mon Sep 17 00:00:00 2001 From: Arthur Zapparoli Date: Mon, 18 Mar 2024 16:09:38 +0100 Subject: [PATCH] feat(websockets): websockets are now enabled by default Signed-off-by: Arthur Zapparoli --- .config.sample.env | 5 ----- README.md | 6 ++---- config/Caddyfile | 6 ------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.config.sample.env b/.config.sample.env index 030fd17..11e8181 100644 --- a/.config.sample.env +++ b/.config.sample.env @@ -81,8 +81,3 @@ DOMAIN=https://vw.example.com # Check https://github.com/dani-garcia/vaultwarden/wiki/Hardening-Guide#disable-password-hint-display # SHOW_PASSWORD_HINT=false - -# Check https://github.com/dani-garcia/vaultwarden/wiki/Enabling-WebSocket-notifications -# You don't need to do any additional configuration, as the template -# already uses Caddy to configure the websocket proxy -WEBSOCKET_ENABLED=true diff --git a/README.md b/README.md index e1c40ae..312190e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # Template for deploying [Vaultwarden] on [Fly.io] This is a template for deploying [Vaultwarden] on [Fly.io] with -[Caddy](https://caddyserver.com) for [websockets] support and -[supercronic](https://github.com/aptible/supercronic) for hourly -[restic](https://restic.net) backups with e-mail failure notification +[Caddy](https://caddyserver.com) and [supercronic](https://github.com/aptible/supercronic) +for hourly [restic](https://restic.net) backups with e-mail failure notification via [msmtp](https://marlam.de/msmtp/). This uses a single fly machine, within Fly's [free allowance](https://fly.io/docs/about/pricing/#free-allowances). @@ -204,5 +203,4 @@ That's all! Now, any changes to your `Dockerfile`, `fly.toml` or [Vaultwarden]: https://github.com/dani-garcia/vaultwarden [Fly.io]: https://fly.io -[websockets]: https://github.com/dani-garcia/vaultwarden/wiki/Enabling-WebSocket-notifications [fly.toml]: fly.toml diff --git a/config/Caddyfile b/config/Caddyfile index 3c16e7a..dc4327c 100644 --- a/config/Caddyfile +++ b/config/Caddyfile @@ -32,12 +32,6 @@ -Last-Modified } - # The negotiation endpoint is also proxied to Rocket - reverse_proxy /notifications/hub/negotiate localhost:8080 - - # Notifications redirected to the websockets server - reverse_proxy /notifications/hub localhost:3012 - # Proxy everything else to Rocket reverse_proxy localhost:8080 { # Send the true remote IP to Rocket, so that vaultwarden can put this in the log