magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-30 03:56:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Changes to matrix"

Browse source 
This reverts commit 465549d00b.
This commit is contained in:
magic_rb 2024-11-18 00:25:09 +01:00
parent 80cf15d04a
commit 3eae029697
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixng/containers/matrix/synapse/default.nix
View file

@ -30,7 +30,6 @@ in {
flake.nixngConfigurations.synapseFederationSender = callPackage ./generic_worker.nix { flake.nixngConfigurations.synapseFederationSender = callPackage ./generic_worker.nix {
name = "generic"; name = "generic";
listener_resources = singleton "health"; listener_resources = singleton "health";
port = 6171;
}; };
flake.nixngConfigurations.synapseFederationReceiver = callPackage ./generic_worker.nix { flake.nixngConfigurations.synapseFederationReceiver = callPackage ./generic_worker.nix {
name = "generic"; name = "generic";
@ -38,7 +37,6 @@ in {
"health" "health"
"federation" "federation"
]; ];
port = 6170;
}; };
flake.nixngConfigurations.synapseClient = callPackage ./generic_worker.nix { flake.nixngConfigurations.synapseClient = callPackage ./generic_worker.nix {
name = "generic"; name = "generic";
@ -46,7 +44,6 @@ in {
"client" "client"
"health" "health"
]; ];
port = 6168;
}; };
flake.nixngConfigurations.synapseSync = callPackage ./generic_worker.nix { flake.nixngConfigurations.synapseSync = callPackage ./generic_worker.nix {
name = "generic"; name = "generic";
@ -54,7 +51,6 @@ in {
"client" "client"
"health" "health"
]; ];
port = 6169;
}; };
flake.nixngConfigurations.synapseRedis = callPackage ./redis.nix {}; flake.nixngConfigurations.synapseRedis = callPackage ./redis.nix {};
flake.nixngConfigurations.synapsePostgreSQL = callPackage ./postgresql.nix {}; flake.nixngConfigurations.synapsePostgreSQL = callPackage ./postgresql.nix {};

6
nixng/containers/matrix/synapse/generic_worker.nix
View file

@ -5,7 +5,6 @@
name, name,
logConfig, logConfig,
commonConfig, commonConfig,
port,
}: }:
makeSystem { makeSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@ -30,15 +29,14 @@ makeSystem {
settings = mkMerge [ settings = mkMerge [
{ {
worker_app = "synapse.app.generic_worker"; worker_app = "synapse.app.generic_worker";
worker_name = "worker-${name}";
worker_listeners = [ worker_listeners = [
{ {
inherit port; port = 6167;
tls = false; tls = false;
type = "http"; type = "http";
x_forwarded = true; x_forwarded = true;
bind_addresses = ["0.0.0.0"]; bind_adrresses = ["0.0.0.0"];
resources = [ resources = [
{ {
names = listener_resources; names = listener_resources;

2
nixng/containers/matrix/synapse/synapse.nix
View file

@ -45,7 +45,7 @@ makeSystem {
tls = false; tls = false;
type = "http"; type = "http";
x_forwarded = true; x_forwarded = true;
bind_addresses = ["0.0.0.0"]; bind_adrresses = ["0.0.0.0"];
resources = singleton { resources = singleton {
names = ["client" "federation"]; names = ["client" "federation"];
compress = false; compress = false;