From 26e0cca2e22fde8ae150354d949d9cfeb8b1833b Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 17 Dec 2021 21:11:21 +0100 Subject: ma bitwarden: finish migration --- makefu/2configs/bitwarden.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/makefu/2configs/bitwarden.nix b/makefu/2configs/bitwarden.nix index 7e317e596..92c1c4e0e 100644 --- a/makefu/2configs/bitwarden.nix +++ b/makefu/2configs/bitwarden.nix @@ -2,7 +2,7 @@ let port = 8812; in { - services.bitwarden_rs = { + services.vaultwarden = { enable = true; dbBackend = "postgresql"; config.signups_allowed = false; @@ -13,17 +13,15 @@ in { config.websocket_enabled = true; }; - systemd.services.bitwarden_rs.after = [ "postgresql.service" ]; + systemd.services.vaultwarden.after = [ "postgresql.service" ]; services.postgresql = { enable = true; ensureDatabases = [ "bitwarden" ]; - ensureUsers = [ { name = "bitwarden_rs"; ensurePermissions."DATABASE bitwarden" = "ALL PRIVILEGES"; } ]; - #initialScript = pkgs.writeText "postgresql-init.sql" '' - # CREATE DATABASE bitwarden; - # CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}'; - # GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser; - #''; + ensureUsers = [ + { name = "bitwarden_rs"; ensurePermissions."DATABASE bitwarden" = "ALL PRIVILEGES"; } + { name = "vaultwarden"; ensurePermissions."DATABASE bitwarden" = "ALL PRIVILEGES"; } + ]; }; services.nginx.virtualHosts."bw.euer.krebsco.de" ={ -- cgit v1.2.3