Compare commits
No commits in common. "f791ea1856243561a52c2a2832201eea94160590" and "a615095f3853486fb43ebe800a13c13f74f725d3" have entirely different histories.
f791ea1856
...
a615095f38
@ -23,7 +23,7 @@
|
||||
./services/matrix
|
||||
./services/monitoring
|
||||
./services/microbin.nix
|
||||
#./services/minecraft.nix
|
||||
./services/minecraft.nix
|
||||
./services/vaultwarden.nix
|
||||
];
|
||||
|
||||
|
@ -1,8 +1,7 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
domain = "matrix-admin.home.feal.no";
|
||||
# backend = "http://127.0.0.1:8008";
|
||||
backend = "http://unix:/run/matrix-synapse/matrix-synapse.sock";
|
||||
backend = "http://127.0.0.1:8008";
|
||||
synapse-admin = pkgs.callPackage ./adminPkg.nix { };
|
||||
in {
|
||||
services.nginx.virtualHosts."${domain}" = {
|
||||
|
@ -2,9 +2,8 @@
|
||||
let
|
||||
cfg = config.services.vaultwarden;
|
||||
domain = "pw.feal.no";
|
||||
address = "127.0.1.2";
|
||||
port = 3011;
|
||||
wsPort = 3012;
|
||||
address = "127.0.0.1";
|
||||
port = 3011; # Note: The websocket port is left as default(3012)
|
||||
in {
|
||||
sops.secrets."vaultwarden/admintoken" = {
|
||||
owner = "vaultwarden";
|
||||
@ -20,16 +19,11 @@ in {
|
||||
|
||||
rocketAddress = address;
|
||||
rocketPort = port;
|
||||
|
||||
websocketEnabled = true;
|
||||
websocketAddress = address;
|
||||
websocketPort = wsPort;
|
||||
|
||||
signupsAllowed = true;
|
||||
signupsVerify = true;
|
||||
signupsDomainsWhitelist = "albrigtsen.it";
|
||||
|
||||
# databaseUrl = "postgresql://vaultwarden:@localhost/vaultwarden?sslmode=disable";
|
||||
databaseUrl = "postgresql://vaultwarden@/vaultwarden";
|
||||
|
||||
signupsAllowed = false;
|
||||
};
|
||||
};
|
||||
|
||||
@ -60,7 +54,7 @@ in {
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
locations."/notifications/hub" = {
|
||||
proxyPass = "http://${address}:${toString wsPort}";
|
||||
proxyPass = "http://localhost:3012";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
locations."/notifications/hub/negotiate" = {
|
||||
|
Loading…
Reference in New Issue
Block a user