Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modules/services: vaultwarden-test -> vaultwarden

Browse source
This commit is contained in:
Infinidoge 2024-01-31 17:24:07 -05:00
parent 902d5d6271
commit 0817ab96aa
Signed by: Infinidoge
SSH key fingerprint: SHA256:oAMyvotlNFraMmZmr+p6AxnNfW/GioTs1pOn3V4tQ7A
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/Infini-OPTIPLEX/vaultwarden.nix
View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
persist.directories = [ config.services.vaultwarden-test.dataDir ]; persist.directories = [ config.services.vaultwarden.dataDir ];
services.nginx.virtualHosts."bitwarden.inx.moe" = config.common.nginx.ssl // { services.nginx.virtualHosts."bitwarden.inx.moe" = config.common.nginx.ssl // {
locations."/" = { locations."/" = {
@ -9,7 +9,7 @@
}; };
}; };
services.vaultwarden-test = { services.vaultwarden = {
enable = true; enable = true;
environmentFile = config.secrets."vaultwarden"; environmentFile = config.secrets."vaultwarden";
dataDir = "/srv/vaultwarden"; dataDir = "/srv/vaultwarden";

8
modules/modules/services/vaultwarden-test.nix → modules/modules/services/vaultwarden.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
let let
cfg = config.services.vaultwarden-test; cfg = config.services.vaultwarden;
user = config.users.users.vaultwarden.name; user = config.users.users.vaultwarden.name;
group = config.users.groups.vaultwarden.name; group = config.users.groups.vaultwarden.name;
@ -42,11 +42,13 @@ let
in in
{ {
disabledModules = [ "services/security/vaultwarden/default.nix" ];
imports = [ imports = [
# (mkRenamedOptionModule [ "services" "bitwarden_rs" ] [ "services" "vaultwarden" ]) (mkRenamedOptionModule [ "services" "bitwarden_rs" ] [ "services" "vaultwarden" ])
]; ];
options.services.vaultwarden-test = with types; { options.services.vaultwarden = with types; {
enable = mkEnableOption (lib.mdDoc "vaultwarden"); enable = mkEnableOption (lib.mdDoc "vaultwarden");
dbBackend = mkOption { dbBackend = mkOption {

2
secrets/default.nix
View file

@ -26,7 +26,7 @@ in
"inx.moe.pem" = withOwner "nginx" secrets."inx.moe.pem"; "inx.moe.pem" = withOwner "nginx" secrets."inx.moe.pem";
"inx.moe.key" = withOwner "nginx" secrets."inx.moe.key"; "inx.moe.key" = withOwner "nginx" secrets."inx.moe.key";
}) })
(mkIf config.services.vaultwarden-test.enable { (mkIf config.services.vaultwarden.enable {
"vaultwarden" = withOwner "vaultwarden" secrets."vaultwarden"; "vaultwarden" = withOwner "vaultwarden" secrets."vaultwarden";
}) })
]; ];