qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
Aaron Bieber 2023-03-09 09:45:22 -07:00
parent 6668733394
commit 56dd4a40f4
No known key found for this signature in database
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -304,11 +304,10 @@
checks = let buildList = [ "europa" "stan" "h" "box" "faf" ];
in with unstable.lib;
foldl' recursiveUpdate { } (mapAttrsToList (name: system: {
"${system.pkgs.stdenv.hostPlatform.system}"."${name}" =
system.config.system.build.toplevel;
}) (filterAttrs
(n: v: (builtins.elem n buildList))
self.nixosConfigurations));
foldl' recursiveUpdate { } (mapAttrsToList (name: system: {
"${system.pkgs.stdenv.hostPlatform.system}"."${name}" =
system.config.system.build.toplevel;
}) (filterAttrs (n: v: (builtins.elem n buildList))
self.nixosConfigurations));
};
}

35
hosts/h/default.nix
View File

@ -30,25 +30,23 @@ let
matrixServer = "tapenet.org";
matrixClientConfig = {
"m.homeserver".base_url = "https://${matrixServer}";
"m.identity_server" = {};
"org.matrix.msc3575".proxy = {
url = "https://${matrixServer}";
};
};
matrixServerConfig = {
"m.server" = "${matrixServer}:443";
"m.identity_server" = { };
"org.matrix.msc3575".proxy = { url = "https://${matrixServer}"; };
};
matrixServerConfig = { "m.server" = "${matrixServer}:443"; };
mkMatrixWellKnown = p: ''
return 200 '${builtins.toJSON p}';
'';
mkMatrixSliderLoc = {
proxyWebsockets = true;
proxyPass = "http://${config.services.sliding-sync.address}:${toString config.services.sliding-sync.port}";
proxyWebsockets = true;
proxyPass = "http://${config.services.sliding-sync.address}:${
toString config.services.sliding-sync.port
}";
};
mkMatrixLoc = {
proxyWebsockets = true;
proxyPass = "http://127.0.0.1:8009";
proxyWebsockets = true;
proxyPass = "http://127.0.0.1:8009";
};
in {
@ -637,21 +635,26 @@ in {
forceSSL = true;
enableACME = true;
root = "/var/www/tapenet.org";
locations."/.well-known/matrix/client".extraConfig = mkMatrixWellKnown matrixClientConfig;
locations."/.well-known/matrix/server".extraConfig = mkMatrixWellKnown matrixServerConfig;
locations."/.well-known/matrix/client".extraConfig =
mkMatrixWellKnown matrixClientConfig;
locations."/.well-known/matrix/server".extraConfig =
mkMatrixWellKnown matrixServerConfig;
locations."/_matrix" = mkMatrixLoc;
locations."/_matrix/client/v3/sync" = mkMatrixLoc;
locations."/_synapse/client" = mkMatrixLoc;
locations."/client" = mkMatrixSliderLoc;
locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = mkMatrixSliderLoc;
locations."/_matrix/client/unstable/org.matrix.msc3575/sync" =
mkMatrixSliderLoc;
} else {
forceSSL = true;
enableACME = true;
root = "/var/www/tapenet.org";
locations."/.well-known/matrix/client".extraConfig = mkMatrixWellKnown matrixClientConfig;
locations."/.well-known/matrix/server".extraConfig = mkMatrixWellKnown matrixServerConfig;
locations."/.well-known/matrix/client".extraConfig =
mkMatrixWellKnown matrixClientConfig;
locations."/.well-known/matrix/server".extraConfig =
mkMatrixWellKnown matrixServerConfig;
locations."/_matrix" = mkMatrixLoc;
locations."/_synapse/client" = mkMatrixLoc;