From 25eaf5794fa0013a8fe094edaccbf4fa18956f59 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <d@ennis.no>
Date: Mon, 3 May 2021 15:46:37 +0200
Subject: moving one more file, and adding readme for upgrading

---
 README.md                                          | 14 ++++++++++++++
 mkosi.extra/etc/systemd/system/vaultwarden.service |  2 +-
 mkosi.nspawn                                       |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d210eaa..e84ffc3 100644
--- a/README.md
+++ b/README.md
@@ -23,3 +23,17 @@ Now all you need to do is to run it - `machinectl start vaultwarden`. You can
 drop into the container to troubleshoot using `machinectl shell vaultwarden`,
 and you can view logs using `journalctl -M vaultwarden` from the host, or
 `journalctl -u vaultwarden` from inside the container.
+
+## Upgrading from "bitwarden-rs" to "vaultwarden"
+Vaultwarden recently changed name from Bitwarden-RS to Vaultwarden, and a lot
+of files have been moved around. If you've been using this mkosi-template, this
+should be the upgrade-path:
+
+```
+$ sudo mv /etc/bitwarden_rs /etc/vaultwarden
+$ sudo mv /etc/vaultwarden/bitwarden_rs.env /etc/vaultwarden/env
+$ sudo mv /var/local/bitwarden_rs /var/local/vaultwarden
+$ sudo chown -R 29033447:29033447 /var/local/vaultwarden/data
+```
+As you can see, some files have been moved around, and also we've set a more
+static UID for the vaultwarden-user.
diff --git a/mkosi.extra/etc/systemd/system/vaultwarden.service b/mkosi.extra/etc/systemd/system/vaultwarden.service
index b72ea8f..37ded71 100644
--- a/mkosi.extra/etc/systemd/system/vaultwarden.service
+++ b/mkosi.extra/etc/systemd/system/vaultwarden.service
@@ -8,7 +8,7 @@ After=network.target
 User=vaultwarden
 Group=vaultwarden
 # The location of the .env file for configuration
-EnvironmentFile=/etc/vaultwarden/vaultwarden.env
+EnvironmentFile=/etc/vaultwarden/env
 # The location of the compiled binary
 ExecStart=/usr/local/bin/vaultwarden
 # Set reasonable connection and process limits
diff --git a/mkosi.nspawn b/mkosi.nspawn
index 21254ed..b6ad04a 100644
--- a/mkosi.nspawn
+++ b/mkosi.nspawn
@@ -11,7 +11,7 @@ PrivateUsers=29032448
 
 [Files]
 PrivateUsersChown=true
-BindReadOnly=/etc/vaultwarden/vaultwarden.env
+BindReadOnly=/etc/vaultwarden/env
 Bind=/var/local/vaultwarden/data:/var/lib/vaultwarden/data
 
 [Network]
-- 
cgit v1.2.3