gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(bw): websocket port deprecated

Browse source
This commit is contained in:
arcnmx 2024-07-15 10:25:07 -07:00
parent 7fe6d48ff0
commit 4ee6ff86e3
4 changed files with 0 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/nixos/vaultwarden.nix
View file

@ -17,10 +17,6 @@ in {
type = port; type = port;
default = 8222; default = 8222;
}; };
websocketPort = mkOption {
type = nullOr port;
default = null;
};
databaseUrlPath = mkOption { databaseUrlPath = mkOption {
type = nullOr str; type = nullOr str;
default = null; default = null;
@ -41,9 +37,6 @@ in {
ROCKET_ENV = mkOptionDefault "production"; ROCKET_ENV = mkOptionDefault "production";
ROCKET_ADDRESS = mkOptionDefault "::1"; ROCKET_ADDRESS = mkOptionDefault "::1";
ROCKET_PORT = mkOptionDefault cfg.port; ROCKET_PORT = mkOptionDefault cfg.port;
WEBSOCKET_ENABLED = mkOptionDefault (cfg.websocketPort != null);
WEBSOCKET_ADDRESS = mkOptionDefault "::1";
WEBSOCKET_PORT = mkIf (cfg.websocketPort != null) cfg.websocketPort;
}; };
}; };
config.systemd.services.vaultwarden = let config.systemd.services.vaultwarden = let

20
modules/system/exports/vaultwarden.nix
View file

@ -16,14 +16,6 @@ in {
assertion = config.ports.default.port == nixosConfig.services.vaultwarden.port; assertion = config.ports.default.port == nixosConfig.services.vaultwarden.port;
message = "port mismatch"; message = "port mismatch";
}) })
(nixosConfig: {
assertion = nixosConfig.services.vaultwarden.websocketPort == null || config.ports.websocket.port == nixosConfig.services.vaultwarden.websocketPort;
message = "websocketPort mismatch";
})
(nixosConfig: {
assertion = config.ports.websocket.enable == (nixosConfig.services.vaultwarden.websocketPort != null);
message = "websocketPort enable mismatch";
})
]; ];
}; };
ports = { ports = {
@ -32,18 +24,6 @@ in {
protocol = "http"; protocol = "http";
status.enable = mkAlmostOptionDefault true; status.enable = mkAlmostOptionDefault true;
}; };
websocket = {
port = mkAlmostOptionDefault 8223;
protocol = "http";
displayName = mkAlmostOptionDefault "WebSocket";
status = {
enable = mkAlmostOptionDefault true;
gatus.http.websocket = {
enable = mkAlmostOptionDefault true;
status = mkAlmostOptionDefault 401;
};
};
};
}; };
}; };
} }

22
nixos/access/vaultwarden.nix
View file

@ -6,17 +6,9 @@
inherit (lib.modules) mkIf mkDefault; inherit (lib.modules) mkIf mkDefault;
cfg = config.services.vaultwarden; cfg = config.services.vaultwarden;
upstreamName = "vaultwarden'access"; upstreamName = "vaultwarden'access";
upstreamName'websocket = "vaultwarden'websocket'access";
locations = { locations = {
"/".proxy.enable = true; "/".proxy.enable = true;
"/notifications/hub" = { "/notifications/hub" = {
proxy = {
enable = true;
upstream = mkDefault upstreamName'websocket;
websocket.enable = true;
};
};
"/notifications/hub/negotiate" = {
proxy = { proxy = {
enable = true; enable = true;
websocket.enable = true; websocket.enable = true;
@ -41,20 +33,6 @@ in {
}; };
}; };
}; };
${upstreamName'websocket}.servers = {
local = mkIf cfg.enable {
enable = mkDefault (cfg.websocketPort != null);
addr = mkDefault "localhost";
port = mkIf (cfg.websocketPort != null) (mkDefault cfg.websocketPort);
};
access = {upstream, ...}: {
enable = mkDefault (!cfg.enable && !upstream.servers.local.enable or false);
accessService = {
name = "vaultwarden";
port = "websocket";
};
};
};
}; };
virtualHosts = { virtualHosts = {
vaultwarden = { vaultwarden = {

2
nixos/vaultwarden.nix
View file

@ -11,7 +11,6 @@ in {
config.services.vaultwarden = { config.services.vaultwarden = {
enable = mkDefault true; enable = mkDefault true;
dbBackend = mkDefault "postgresql"; dbBackend = mkDefault "postgresql";
websocketPort = mkDefault 8223;
databaseUrlPath = mkIf (!postgresql.enable) (mkDefault config.sops.secrets.vaultwarden-database-url.path); databaseUrlPath = mkIf (!postgresql.enable) (mkDefault config.sops.secrets.vaultwarden-database-url.path);
adminTokenPath = mkIf enableAdmin (mkDefault config.sops.secrets.vaultwarden-admin-token.path); adminTokenPath = mkIf enableAdmin (mkDefault config.sops.secrets.vaultwarden-admin-token.path);
config = { config = {
@ -32,7 +31,6 @@ in {
config.networking.firewall = mkIf cfg.enable { config.networking.firewall = mkIf cfg.enable {
interfaces.lan.allowedTCPPorts = [ interfaces.lan.allowedTCPPorts = [
cfg.port cfg.port
(mkIf (cfg.websocketPort != null) cfg.websocketPort)
]; ];
}; };
config.sops.secrets = let config.sops.secrets = let