diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-07-03 11:15:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-03 11:15:22 +0100 |
commit | a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8 (patch) | |
tree | 0e2d57ed02d2f0d882c6131a20cb9031d48aa566 /nixos/tests | |
parent | ed45204084663a12b468453cd83abaaec0076a47 (diff) | |
parent | dc1b56c714095d787f52c45c83723944dfeef779 (diff) | |
download | nixlib-a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8.tar nixlib-a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8.tar.gz nixlib-a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8.tar.bz2 nixlib-a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8.tar.lz nixlib-a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8.tar.xz nixlib-a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8.tar.zst nixlib-a47ace80e56f3398a957d6c1c510ce8aa7c4e5a8.zip |
Merge pull request #126187 from K900/vaultwarden
vaultwarden: update to 1.21.0, rename from bitwarden_rs
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/all-tests.nix | 2 | ||||
-rw-r--r-- | nixos/tests/vaultwarden.nix (renamed from nixos/tests/bitwarden.nix) | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d18770859f26..c77e72a7f49f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -42,7 +42,6 @@ in bind = handleTest ./bind.nix {}; bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; - bitwarden = handleTest ./bitwarden.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 boot-stage1 = handleTest ./boot-stage1.nix {}; @@ -447,6 +446,7 @@ in v2ray = handleTest ./v2ray.nix {}; vault = handleTest ./vault.nix {}; vault-postgresql = handleTest ./vault-postgresql.nix {}; + vaultwarden = handleTest ./vaultwarden.nix {}; vector = handleTest ./vector.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/vaultwarden.nix index f64cf171f01f..b5343f5cad2d 100644 --- a/nixos/tests/bitwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -4,7 +4,7 @@ }: # These tests will: -# * Set up a bitwarden-rs server +# * Set up a vaultwarden server # * Have Firefox use the web vault to create an account, log in, and save a password to the valut # * Have the bw cli log in and read that password from the vault # @@ -24,8 +24,8 @@ let storedPassword = "seeeecret"; - makeBitwardenTest = backend: makeTest { - name = "bitwarden_rs-${backend}"; + makeVaultwardenTest = backend: makeTest { + name = "vaultwarden-${backend}"; meta = { maintainers = with pkgs.lib.maintainers; [ jjjollyjim ]; }; @@ -45,9 +45,9 @@ let package = pkgs.mariadb; }; - services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + services.vaultwarden.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden"; - systemd.services.bitwarden_rs.after = [ "mysql.service" ]; + systemd.services.vaultwarden.after = [ "mysql.service" ]; }; postgresql = { @@ -60,9 +60,9 @@ let ''; }; - services.bitwarden_rs.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + services.vaultwarden.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden"; - systemd.services.bitwarden_rs.after = [ "postgresql.service" ]; + systemd.services.vaultwarden.after = [ "postgresql.service" ]; }; sqlite = { }; @@ -71,7 +71,7 @@ let mkMerge [ backendConfig.${backend} { - services.bitwarden_rs = { + services.vaultwarden = { enable = true; dbBackend = backend; config.rocketPort = 80; @@ -152,7 +152,7 @@ let testScript = '' start_all() - server.wait_for_unit("bitwarden_rs.service") + server.wait_for_unit("vaultwarden.service") server.wait_for_open_port(80) with subtest("configure the cli"): @@ -184,6 +184,6 @@ let in builtins.listToAttrs ( map - (backend: { name = backend; value = makeBitwardenTest backend; }) + (backend: { name = backend; value = makeVaultwardenTest backend; }) backends ) |