Compare commits

..

3 Commits

3 changed files with 16 additions and 9 deletions

View File

@ -23,7 +23,7 @@
./services/matrix ./services/matrix
./services/monitoring ./services/monitoring
./services/microbin.nix ./services/microbin.nix
./services/minecraft.nix #./services/minecraft.nix
./services/vaultwarden.nix ./services/vaultwarden.nix
]; ];

View File

@ -1,7 +1,8 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
domain = "matrix-admin.home.feal.no"; domain = "matrix-admin.home.feal.no";
backend = "http://127.0.0.1:8008"; # backend = "http://127.0.0.1:8008";
backend = "http://unix:/run/matrix-synapse/matrix-synapse.sock";
synapse-admin = pkgs.callPackage ./adminPkg.nix { }; synapse-admin = pkgs.callPackage ./adminPkg.nix { };
in { in {
services.nginx.virtualHosts."${domain}" = { services.nginx.virtualHosts."${domain}" = {

View File

@ -2,8 +2,9 @@
let let
cfg = config.services.vaultwarden; cfg = config.services.vaultwarden;
domain = "pw.feal.no"; domain = "pw.feal.no";
address = "127.0.0.1"; address = "127.0.1.2";
port = 3011; # Note: The websocket port is left as default(3012) port = 3011;
wsPort = 3012;
in { in {
sops.secrets."vaultwarden/admintoken" = { sops.secrets."vaultwarden/admintoken" = {
owner = "vaultwarden"; owner = "vaultwarden";
@ -19,11 +20,16 @@ in {
rocketAddress = address; rocketAddress = address;
rocketPort = port; rocketPort = port;
websocketEnabled = true;
# databaseUrl = "postgresql://vaultwarden:@localhost/vaultwarden?sslmode=disable";
databaseUrl = "postgresql://vaultwarden@/vaultwarden";
signupsAllowed = false; websocketEnabled = true;
websocketAddress = address;
websocketPort = wsPort;
signupsAllowed = true;
signupsVerify = true;
signupsDomainsWhitelist = "albrigtsen.it";
databaseUrl = "postgresql://vaultwarden@/vaultwarden";
}; };
}; };
@ -54,7 +60,7 @@ in {
proxyWebsockets = true; proxyWebsockets = true;
}; };
locations."/notifications/hub" = { locations."/notifications/hub" = {
proxyPass = "http://localhost:3012"; proxyPass = "http://${address}:${toString wsPort}";
proxyWebsockets = true; proxyWebsockets = true;
}; };
locations."/notifications/hub/negotiate" = { locations."/notifications/hub/negotiate" = {