Initialize flake
This commit is contained in:
Daniel Løvbrøtte Olsen
System administrator
parent
cfed55f61a
commit
121dcd8ab2
|
|
@ -1,3 +1,2 @@
|
||||||
result*
|
result*
|
||||||
/hardware-configuration.nix
|
|
||||||
/configuration.nix
|
/configuration.nix
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,99 @@
|
||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"matrix-next": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1666374399,
|
||||||
|
"narHash": "sha256-fnmCOyHZC+iHqmj0pXhuPKI+6ZyxbxuOnxR2A5hxrZU=",
|
||||||
|
"owner": "dali99",
|
||||||
|
"repo": "nixos-matrix-modules",
|
||||||
|
"rev": "f890dff8b0edab00eb44dc6ddac81ecfe1d211bc",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "dali99",
|
||||||
|
"ref": "flake-experiments",
|
||||||
|
"repo": "nixos-matrix-modules",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1670417427,
|
||||||
|
"narHash": "sha256-dKLe2bsw0cjV6uzwleF0wwpf98WaC9fbGkZXd0frQTs=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "fc387d3c367e6d090fb011e351cb14901568ec38",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-22.11-small",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-stable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1670146390,
|
||||||
|
"narHash": "sha256-XrEoDpuloRHHbUkbPnhF2bQ0uwHllXq3NHxtuVe/QK4=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "86370507cb20c905800527539fc049a2bf09c667",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "release-22.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"matrix-next": "matrix-next",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"sops-nix": "sops-nix",
|
||||||
|
"unstable": "unstable"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"sops-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1670149631,
|
||||||
|
"narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=",
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "sops-nix",
|
||||||
|
"rev": "da98a111623101c64474a14983d83dad8f09f93d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "sops-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1670418855,
|
||||||
|
"narHash": "sha256-JCB34YSz+FpQKWbwaKz8eaZCdgkw/XreJPFcLIGQZLk=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "b5e342b8cf9298b7f7a3e10f051f012c459c40b1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable-small",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
{
|
||||||
|
description = "PVV System flake";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11-small";
|
||||||
|
unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
|
||||||
|
|
||||||
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
|
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
|
matrix-next.url = "github:dali99/nixos-matrix-modules/flake-experiments";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs, unstable, sops-nix, ... }@inputs: {
|
||||||
|
nixosConfigurations = {
|
||||||
|
jokum = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
specialArgs = { inherit unstable; };
|
||||||
|
modules = [
|
||||||
|
./hosts/jokum/configuration.nix
|
||||||
|
sops-nix.nixosModules.sops
|
||||||
|
|
||||||
|
inputs.matrix-next.nixosModules.synapse
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,13 +1,8 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
let
|
|
||||||
unstable = import <nixos-unstable> { };
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
<sops-nix/modules/sops>
|
|
||||||
|
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
../../hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
../../base.nix
|
../../base.nix
|
||||||
# Users can just import any configuration they want even for non-user things. Improve the users/default.nix to just load some specific attributes if this isn't wanted
|
# Users can just import any configuration they want even for non-user things. Improve the users/default.nix to just load some specific attributes if this isn't wanted
|
||||||
|
|
@ -18,13 +13,6 @@ in
|
||||||
../../services/nginx
|
../../services/nginx
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
# Allow accessing <nixos-unstable> through pkgs.unstable.*
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
inherit unstable;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
sops.defaultSopsFile = ../../secrets/jokum/jokum.yaml;
|
sops.defaultSopsFile = ../../secrets/jokum/jokum.yaml;
|
||||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
sops.age.keyFile = "/var/lib/sops-nix/key.txt";
|
sops.age.keyFile = "/var/lib/sops-nix/key.txt";
|
||||||
|
|
@ -82,4 +70,3 @@ in
|
||||||
system.stateVersion = "21.05"; # Did you read the comment?
|
system.stateVersion = "21.05"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,29 @@
|
||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{ device = "/dev/disk/by-uuid/1a8bf91a-5948-40c2-a9fd-7a33e46fa441";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/data" =
|
||||||
|
{ device = "/dev/disk/by-uuid/c812e204-b998-4ec5-9f26-29c5808ed6ba";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
{ config, lib, pkgs, secrets, ... }:
|
{ config, lib, pkgs, secrets, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ./synapse-module ];
|
|
||||||
|
|
||||||
sops.secrets."matrix/synapse/turnconfig" = {
|
sops.secrets."matrix/synapse/turnconfig" = {
|
||||||
owner = config.users.users.matrix-synapse.name;
|
owner = config.users.users.matrix-synapse.name;
|
||||||
group = config.users.users.matrix-synapse.group;
|
group = config.users.users.matrix-synapse.group;
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,6 @@ let
|
||||||
cfg = config.services.mx-puppet-discord;
|
cfg = config.services.mx-puppet-discord;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [ ./synapse-module ];
|
|
||||||
|
|
||||||
users.groups.keys-matrix-registrations = { };
|
users.groups.keys-matrix-registrations = { };
|
||||||
|
|
||||||
sops.secrets."matrix/registrations/mx-puppet-discord" = {
|
sops.secrets."matrix/registrations/mx-puppet-discord" = {
|
||||||
|
|
|
||||||
|
|
@ -1,717 +0,0 @@
|
||||||
{ lib, pkgs, config, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.matrix-synapse-next;
|
|
||||||
wcfg = cfg.workers;
|
|
||||||
|
|
||||||
format = pkgs.formats.yaml {};
|
|
||||||
matrix-synapse-common-config = format.generate "matrix-synapse-common-config.yaml" cfg.settings;
|
|
||||||
pluginsEnv = cfg.package.python.buildEnv.override {
|
|
||||||
extraLibs = cfg.plugins;
|
|
||||||
};
|
|
||||||
|
|
||||||
genAttrs' = items: f: g: builtins.listToAttrs (builtins.map (i: lib.attrsets.nameValuePair (f i) (g i)) items);
|
|
||||||
|
|
||||||
isListenerType = type: listener: lib.lists.any (r: lib.lists.any (n: n == type) r.names) listener.resources;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.services.matrix-synapse-next = {
|
|
||||||
enable = lib.mkEnableOption "matrix-synapse";
|
|
||||||
|
|
||||||
package = lib.mkOption {
|
|
||||||
type = lib.types.package;
|
|
||||||
default = pkgs.matrix-synapse;
|
|
||||||
};
|
|
||||||
|
|
||||||
plugins = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.package;
|
|
||||||
default = [ ];
|
|
||||||
example = lib.literalExample ''
|
|
||||||
with config.services.matrix-synapse-advanced.package.plugins; [
|
|
||||||
matrix-synapse-ldap3
|
|
||||||
matrix-synapse-pam
|
|
||||||
];
|
|
||||||
'';
|
|
||||||
description = ''
|
|
||||||
List of additional Matrix plugins to make available.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
dataDir = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "/var/lib/matrix-synapse";
|
|
||||||
description = ''
|
|
||||||
The directory where matrix-synapse stores its stateful data such as
|
|
||||||
certificates, media and uploads.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
enableNginx = lib.mkEnableOption "Enable the synapse module managing nginx";
|
|
||||||
|
|
||||||
public_baseurl = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "matrix.${cfg.settings.server_name}";
|
|
||||||
description = "The domain where clients and such will connect (May be different from server_name if using delegation)";
|
|
||||||
};
|
|
||||||
|
|
||||||
mainLogConfig = lib.mkOption {
|
|
||||||
type = lib.types.lines;
|
|
||||||
description = "A yaml python logging config file";
|
|
||||||
default = lib.readFile ./matrix-synapse-log_config.yaml;
|
|
||||||
};
|
|
||||||
|
|
||||||
workers = let
|
|
||||||
isReplication = l: lib.lists.any (r: lib.lists.any (n: n == "replication") r.names) l.resources;
|
|
||||||
|
|
||||||
dMRL = lib.lists.findFirst isReplication
|
|
||||||
(throw "No replication listener configured!")
|
|
||||||
cfg.settings.listeners;
|
|
||||||
|
|
||||||
dMRH = lib.findFirst (x: true) (throw "Replication listener had no addresses")
|
|
||||||
dMRL.bind_addresses;
|
|
||||||
dMRP = dMRL.port;
|
|
||||||
in {
|
|
||||||
mainReplicationHost = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = if builtins.elem dMRH [ "0.0.0.0" "::" ] then "127.0.0.1" else dMRH;
|
|
||||||
description = "Host of the main synapse instance's replication listener";
|
|
||||||
};
|
|
||||||
|
|
||||||
mainReplicationPort = lib.mkOption {
|
|
||||||
type = lib.types.port;
|
|
||||||
default = dMRP;
|
|
||||||
description = "Port for the main synapse instance's replication listener";
|
|
||||||
};
|
|
||||||
|
|
||||||
defaultListenerAddress = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "127.0.0.1";
|
|
||||||
description = "The default listener address for the worker";
|
|
||||||
};
|
|
||||||
|
|
||||||
workerStartingPort = lib.mkOption {
|
|
||||||
type = lib.types.port;
|
|
||||||
description = "What port should the automatically configured workers start enumerating from";
|
|
||||||
default = 8083;
|
|
||||||
};
|
|
||||||
|
|
||||||
enableMetrics = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = cfg.settings.enable_metrics;
|
|
||||||
};
|
|
||||||
|
|
||||||
metricsStartingPort = lib.mkOption {
|
|
||||||
type = lib.types.port;
|
|
||||||
default = 18083;
|
|
||||||
};
|
|
||||||
|
|
||||||
federationSenders = lib.mkOption {
|
|
||||||
type = lib.types.ints.unsigned;
|
|
||||||
description = "How many automatically configured federation senders to set up";
|
|
||||||
default = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
federationReceivers = lib.mkOption {
|
|
||||||
type = lib.types.ints.unsigned;
|
|
||||||
description = "How many automatically configured federation recievers to set up";
|
|
||||||
default = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
instances = lib.mkOption {
|
|
||||||
type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
|
|
||||||
|
|
||||||
options.isAuto = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
internal = true;
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
options.index = lib.mkOption {
|
|
||||||
internal = true;
|
|
||||||
type = lib.types.ints.positive;
|
|
||||||
};
|
|
||||||
|
|
||||||
# The custom string type here is mainly for the name to use for the metrics of custom worker types
|
|
||||||
options.type = lib.mkOption {
|
|
||||||
type = lib.types.either (lib.types.str) (lib.types.enum [ "fed-sender" "fed-receiver" ]);
|
|
||||||
};
|
|
||||||
|
|
||||||
options.settings = let
|
|
||||||
instanceCfg = config;
|
|
||||||
inherit (instanceCfg) type isAuto;
|
|
||||||
in lib.mkOption {
|
|
||||||
type = lib.types.submodule ({config, ...}: {
|
|
||||||
freeformType = format.type;
|
|
||||||
|
|
||||||
options.worker_app = let
|
|
||||||
mapTypeApp = t: {
|
|
||||||
"fed-sender" = "synapse.app.federation_sender";
|
|
||||||
"fed-receiver" = "synapse.app.generic_worker";
|
|
||||||
}.${t};
|
|
||||||
defaultApp = if (!isAuto)
|
|
||||||
then "synapse.app.generic_worker"
|
|
||||||
else mapTypeApp type;
|
|
||||||
in lib.mkOption {
|
|
||||||
type = lib.types.enum [
|
|
||||||
"synapse.app.generic_worker"
|
|
||||||
"synapse.app.pusher"
|
|
||||||
"synapse.app.appservice"
|
|
||||||
"synapse.app.federation_sender"
|
|
||||||
"synapse.app.media_repository"
|
|
||||||
"synapse.app.user_dir"
|
|
||||||
];
|
|
||||||
description = "The type of worker application";
|
|
||||||
default = defaultApp;
|
|
||||||
};
|
|
||||||
options.worker_replication_host = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = cfg.workers.mainReplicationHost;
|
|
||||||
description = "The replication listeners ip on the main synapse process";
|
|
||||||
};
|
|
||||||
options.worker_replication_http_port = lib.mkOption {
|
|
||||||
type = lib.types.port;
|
|
||||||
default = cfg.workers.mainReplicationPort;
|
|
||||||
description = "The replication listeners port on the main synapse process";
|
|
||||||
};
|
|
||||||
options.worker_listeners = lib.mkOption {
|
|
||||||
type = lib.types.listOf (lib.types.submodule {
|
|
||||||
options.type = lib.mkOption {
|
|
||||||
type = lib.types.enum [ "http" "metrics" ];
|
|
||||||
description = "The type of the listener";
|
|
||||||
default = "http";
|
|
||||||
};
|
|
||||||
options.port = lib.mkOption {
|
|
||||||
type = lib.types.port;
|
|
||||||
description = "the TCP port to bind to";
|
|
||||||
};
|
|
||||||
options.bind_addresses = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.str;
|
|
||||||
description = "A list of local addresses to listen on";
|
|
||||||
default = [ cfg.workers.defaultListenerAddress ];
|
|
||||||
};
|
|
||||||
options.tls = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "set to true to enable TLS for this listener. Will use the TLS key/cert specified in tls_private_key_path / tls_certificate_path.";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
options.x_forwarded = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = ''
|
|
||||||
Only valid for an 'http' listener. Set to true to use the X-Forwarded-For header as the client IP.
|
|
||||||
Useful when Synapse is behind a reverse-proxy.
|
|
||||||
'';
|
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
options.resources = let
|
|
||||||
typeToResources = t: {
|
|
||||||
"fed-receiver" = [ "federation" ];
|
|
||||||
"fed-sender" = [ ];
|
|
||||||
}.${t};
|
|
||||||
in lib.mkOption {
|
|
||||||
type = lib.types.listOf (lib.types.submodule {
|
|
||||||
options.names = lib.mkOption {
|
|
||||||
type = lib.types.listOf (lib.types.enum [ "client" "consent" "federation" "keys" "media" "metrics" "openid" "replication" "static" "webclient" ]);
|
|
||||||
description = "A list of resources to host on this port";
|
|
||||||
default = lib.optionals isAuto (typeToResources type);
|
|
||||||
};
|
|
||||||
options.compress = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "enable HTTP compression for this resource";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
default = [{ }];
|
|
||||||
};
|
|
||||||
});
|
|
||||||
description = "Listener configuration for the worker, similar to the main synapse listener";
|
|
||||||
default = [ ];
|
|
||||||
};
|
|
||||||
});
|
|
||||||
default = { };
|
|
||||||
};
|
|
||||||
}));
|
|
||||||
default = { };
|
|
||||||
description = "Worker configuration";
|
|
||||||
example = {
|
|
||||||
"federation_sender1" = {
|
|
||||||
settings = {
|
|
||||||
worker_name = "federation_sender1";
|
|
||||||
worker_app = "synapse.app.federation_sender";
|
|
||||||
|
|
||||||
worker_replication_host = "127.0.0.1";
|
|
||||||
worker_replication_http_port = 9093;
|
|
||||||
worker_listeners = [ ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
settings = lib.mkOption {
|
|
||||||
type = lib.types.submodule {
|
|
||||||
freeformType = format.type;
|
|
||||||
|
|
||||||
options.server_name = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = ''
|
|
||||||
The server_name name will appear at the end of usernames and room addresses
|
|
||||||
created on this server. For example if the server_name was example.com,
|
|
||||||
usernames on this server would be in the format @user:example.com
|
|
||||||
|
|
||||||
In most cases you should avoid using a matrix specific subdomain such as
|
|
||||||
matrix.example.com or synapse.example.com as the server_name for the same
|
|
||||||
reasons you wouldn't use user@email.example.com as your email address.
|
|
||||||
See https://github.com/matrix-org/synapse/blob/master/docs/delegate.md
|
|
||||||
for information on how to host Synapse on a subdomain while preserving
|
|
||||||
a clean server_name.
|
|
||||||
|
|
||||||
The server_name cannot be changed later so it is important to
|
|
||||||
configure this correctly before you start Synapse. It should be all
|
|
||||||
lowercase and may contain an explicit port.
|
|
||||||
'';
|
|
||||||
example = "matrix.org";
|
|
||||||
};
|
|
||||||
|
|
||||||
options.use_presence = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "disable presence tracking, if you're having perfomance issues this can have a big impact";
|
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
options.listeners = lib.mkOption {
|
|
||||||
type = lib.types.listOf (lib.types.submodule {
|
|
||||||
options.port = lib.mkOption {
|
|
||||||
type = lib.types.port;
|
|
||||||
description = "the TCP port to bind to";
|
|
||||||
example = 8448;
|
|
||||||
};
|
|
||||||
options.bind_addresses = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.str;
|
|
||||||
description = "A list of local addresses to listen on";
|
|
||||||
};
|
|
||||||
options.type = lib.mkOption {
|
|
||||||
type = lib.types.enum [ "http" "manhole" "metrics" "replication" ];
|
|
||||||
description = "The type of the listener";
|
|
||||||
default = "http";
|
|
||||||
};
|
|
||||||
options.tls = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "set to true to enable TLS for this listener. Will use the TLS key/cert specified in tls_private_key_path / tls_certificate_path.";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
options.x_forwarded = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = ''
|
|
||||||
Only valid for an 'http' listener. Set to true to use the X-Forwarded-For header as the client IP.
|
|
||||||
Useful when Synapse is behind a reverse-proxy.
|
|
||||||
'';
|
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
options.resources = lib.mkOption {
|
|
||||||
type = lib.types.listOf (lib.types.submodule {
|
|
||||||
options.names = lib.mkOption {
|
|
||||||
type = lib.types.listOf (lib.types.enum [ "client" "consent" "federation" "keys" "media" "metrics" "openid" "replication" "static" "webclient" ]);
|
|
||||||
description = "A list of resources to host on this port";
|
|
||||||
};
|
|
||||||
options.compress = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "enable HTTP compression for this resource";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
});
|
|
||||||
description = "List of ports that Synapse should listen on, their purpose and their configuration";
|
|
||||||
default = let
|
|
||||||
enableReplication = lib.lists.any
|
|
||||||
(w: !(builtins.elem w.settings.worker_app [ "synapse.app.federation_sender" ]))
|
|
||||||
(builtins.attrValues cfg.workers.instances);
|
|
||||||
in [
|
|
||||||
{
|
|
||||||
port = 8008;
|
|
||||||
bind_addresses = [ "127.0.0.1" ];
|
|
||||||
resources = [
|
|
||||||
{ names = [ "client" ]; compress = true; }
|
|
||||||
{ names = [ "federation" ]; compress = false; }
|
|
||||||
];
|
|
||||||
}
|
|
||||||
(lib.mkIf enableReplication {
|
|
||||||
port = 9093;
|
|
||||||
bind_addresses = [ "127.0.0.1" ];
|
|
||||||
resources = [
|
|
||||||
{ names = [ "replication" ]; }
|
|
||||||
];
|
|
||||||
})
|
|
||||||
(lib.mkIf cfg.settings.enable_metrics {
|
|
||||||
port = 9000;
|
|
||||||
bind_addresses = [ "127.0.0.1" ];
|
|
||||||
resources = [
|
|
||||||
{ names = [ "metrics" ]; }
|
|
||||||
];
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
options.federation_ip_range_blacklist = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.str;
|
|
||||||
description = ''
|
|
||||||
Prevent federation requests from being sent to the following
|
|
||||||
blacklist IP address CIDR ranges. If this option is not specified, or
|
|
||||||
specified with an empty list, no ip range blacklist will be enforced.
|
|
||||||
'';
|
|
||||||
default = [
|
|
||||||
"127.0.0.0/8"
|
|
||||||
"10.0.0.0/8"
|
|
||||||
"172.16.0.0/12"
|
|
||||||
"192.168.0.0/16"
|
|
||||||
"100.64.0.0/10"
|
|
||||||
"169.254.0.0/16"
|
|
||||||
"::1/128"
|
|
||||||
"fe80::/64"
|
|
||||||
"fc00::/7"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
options.log_config = lib.mkOption {
|
|
||||||
type = lib.types.path;
|
|
||||||
description = ''
|
|
||||||
A yaml python logging config file as described by
|
|
||||||
https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema
|
|
||||||
'';
|
|
||||||
default = pkgs.writeText "log_config.yaml" cfg.mainLogConfig;
|
|
||||||
};
|
|
||||||
|
|
||||||
options.media_store_path = lib.mkOption {
|
|
||||||
type = lib.types.path;
|
|
||||||
description = "Directory where uploaded images and attachments are stored";
|
|
||||||
default = "${cfg.dataDir}/media_store";
|
|
||||||
};
|
|
||||||
options.max_upload_size = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "The largest allowed upload size in bytes";
|
|
||||||
default = "50M";
|
|
||||||
};
|
|
||||||
|
|
||||||
options.enable_registration = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "Enable registration for new users";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
options.enable_metrics = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "Enable collection and rendering of performance metrics";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
options.report_stats = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "TODO: Enable and Disable reporting usage stats";
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
options.app_service_config_files = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.path;
|
|
||||||
description = "A list of application service config files to use";
|
|
||||||
default = [];
|
|
||||||
};
|
|
||||||
|
|
||||||
options.signing_key_path = lib.mkOption {
|
|
||||||
type = lib.types.path;
|
|
||||||
description = "Path to the signing key to sign messages with";
|
|
||||||
default = "${cfg.dataDir}/homeserver.signing.key";
|
|
||||||
};
|
|
||||||
|
|
||||||
options.trusted_key_servers = lib.mkOption {
|
|
||||||
type = lib.types.listOf (lib.types.submodule {
|
|
||||||
freeformType = format.type;
|
|
||||||
|
|
||||||
options.server_name = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
description = "the name of the server. required";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
description = "The trusted servers to download signing keys from";
|
|
||||||
default = [
|
|
||||||
{
|
|
||||||
server_name = "matrix.org";
|
|
||||||
verify_keys."ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
options.send_federation = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "Disables sending of outbound federation transactions on the main process. Set to false if using federation senders";
|
|
||||||
default = cfg.settings.federation_sender_instances == [];
|
|
||||||
};
|
|
||||||
|
|
||||||
options.federation_sender_instances = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.str;
|
|
||||||
description = ''
|
|
||||||
This configuration must be shared between all federation sender workers, and if
|
|
||||||
changed all federation sender workers must be stopped at the same time and then
|
|
||||||
started, to ensure that all instances are running with the same config (otherwise
|
|
||||||
events may be dropped)
|
|
||||||
'';
|
|
||||||
default = [ ];
|
|
||||||
};
|
|
||||||
|
|
||||||
options.redis = lib.mkOption {
|
|
||||||
type = lib.types.submodule {
|
|
||||||
freeformType = format.type;
|
|
||||||
|
|
||||||
options.enabled = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
description = "Enables using redis, required for worker support";
|
|
||||||
default = (lib.lists.count (x: true)
|
|
||||||
(lib.attrsets.attrValues cfg.workers.instances)) > 0;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
default = { };
|
|
||||||
description = "configuration of redis for synapse and workers";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
extraConfigFiles = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.path;
|
|
||||||
default = [];
|
|
||||||
description = ''
|
|
||||||
Extra config files to include.
|
|
||||||
The configuration files will be included based on the command line
|
|
||||||
argument --config-path. This allows to configure secrets without
|
|
||||||
having to go through the Nix store, e.g. based on deployment keys if
|
|
||||||
NixOPS is in use.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable (lib.mkMerge [
|
|
||||||
({
|
|
||||||
users.users.matrix-synapse = {
|
|
||||||
group = "matrix-synapse";
|
|
||||||
home = cfg.dataDir;
|
|
||||||
createHome = true;
|
|
||||||
shell = "${pkgs.bash}/bin/bash";
|
|
||||||
uid = config.ids.uids.matrix-synapse;
|
|
||||||
};
|
|
||||||
users.groups.matrix-synapse = {
|
|
||||||
gid = config.ids.gids.matrix-synapse;
|
|
||||||
};
|
|
||||||
systemd.targets.matrix-synapse = {
|
|
||||||
description = "Synapse parent target";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
};
|
|
||||||
})
|
|
||||||
|
|
||||||
({
|
|
||||||
systemd.services.matrix-synapse = {
|
|
||||||
description = "Synapse Matrix homeserver";
|
|
||||||
partOf = [ "matrix-synapse.target" ];
|
|
||||||
wantedBy = [ "matrix-synapse.target" ];
|
|
||||||
preStart = ''
|
|
||||||
${cfg.package}/bin/synapse_homeserver \
|
|
||||||
${ lib.concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ matrix-synapse-common-config ] ++ cfg.extraConfigFiles) }
|
|
||||||
--keys-directory ${cfg.dataDir} \
|
|
||||||
--generate-keys
|
|
||||||
'';
|
|
||||||
environment.PYTHONPATH = lib.makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "notify";
|
|
||||||
User = "matrix-synapse";
|
|
||||||
Group = "matrix-synapse";
|
|
||||||
WorkingDirectory = cfg.dataDir;
|
|
||||||
ExecStart = ''
|
|
||||||
${cfg.package}/bin/synapse_homeserver \
|
|
||||||
${ lib.concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ matrix-synapse-common-config ] ++ cfg.extraConfigFiles) }
|
|
||||||
--keys-directory ${cfg.dataDir}
|
|
||||||
'';
|
|
||||||
ExecReload = "${pkgs.utillinux}/bin/kill -HUP $MAINPID";
|
|
||||||
Restart = "on-failure";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
})
|
|
||||||
|
|
||||||
(lib.mkMerge [
|
|
||||||
({
|
|
||||||
services.matrix-synapse-next.settings.federation_sender_instances = lib.genList (i: "auto-fed-sender${toString (i + 1)}") cfg.workers.federationSenders;
|
|
||||||
services.matrix-synapse-next.workers.instances = genAttrs' (lib.lists.range 1 cfg.workers.federationSenders)
|
|
||||||
(i: "auto-fed-sender${toString i}")
|
|
||||||
(i: {
|
|
||||||
isAuto = true; type = "fed-sender"; index = i;
|
|
||||||
settings.worker_listeners = lib.mkIf wcfg.enableMetrics [
|
|
||||||
{ port = cfg.workers.metricsStartingPort + i - 1;
|
|
||||||
resources = [ { names = [ "metrics" ]; } ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
});
|
|
||||||
})
|
|
||||||
|
|
||||||
({
|
|
||||||
services.matrix-synapse-next.workers.instances = genAttrs' (lib.lists.range 1 cfg.workers.federationReceivers)
|
|
||||||
(i: "auto-fed-receiver${toString i}")
|
|
||||||
(i: {
|
|
||||||
isAuto = true; type = "fed-receiver"; index = i;
|
|
||||||
settings.worker_listeners = [{ port = cfg.workers.workerStartingPort + i - 1; }]
|
|
||||||
++ lib.optional wcfg.enableMetrics { port = cfg.workers.metricsStartingPort + cfg.workers.federationSenders + i;
|
|
||||||
resources = [ { names = [ "metrics" ]; } ];
|
|
||||||
};
|
|
||||||
});
|
|
||||||
})
|
|
||||||
])
|
|
||||||
|
|
||||||
({
|
|
||||||
systemd.services = let
|
|
||||||
workerList = lib.mapAttrsToList (name: value: lib.nameValuePair name value ) cfg.workers.instances;
|
|
||||||
workerName = worker: worker.name;
|
|
||||||
workerSettings = worker: (worker.value.settings // {worker_name = (workerName worker);});
|
|
||||||
workerConfig = worker: format.generate "matrix-synapse-worker-${workerName worker}-config.yaml" (workerSettings worker);
|
|
||||||
in builtins.listToAttrs (map (worker:
|
|
||||||
{
|
|
||||||
name = "matrix-synapse-worker-${workerName worker}";
|
|
||||||
value = {
|
|
||||||
description = "Synapse Matrix Worker";
|
|
||||||
partOf = [ "matrix-synapse.target" ];
|
|
||||||
wantedBy = [ "matrix-synapse.target" ];
|
|
||||||
after = [ "matrix-synapse.service" ];
|
|
||||||
requires = [ "matrix-synapse.service" ];
|
|
||||||
environment.PYTHONPATH = lib.makeSearchPathOutput "lib" cfg.package.python.sitePackages [
|
|
||||||
pluginsEnv
|
|
||||||
];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "notify";
|
|
||||||
User = "matrix-synapse";
|
|
||||||
Group = "matrix-synapse";
|
|
||||||
WorkingDirectory = cfg.dataDir;
|
|
||||||
ExecStartPre = pkgs.writers.writeBash "wait-for-synapse" ''
|
|
||||||
# From https://md.darmstadt.ccc.de/synapse-at-work
|
|
||||||
while ! systemctl is-active -q matrix-synapse.service; do
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
ExecStart = ''
|
|
||||||
${cfg.package}/bin/synapse_worker \
|
|
||||||
${ lib.concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ matrix-synapse-common-config (workerConfig worker) ] ++ cfg.extraConfigFiles) }
|
|
||||||
--keys-directory ${cfg.dataDir}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
) workerList);
|
|
||||||
})
|
|
||||||
|
|
||||||
(lib.mkIf cfg.enableNginx {
|
|
||||||
services.nginx.commonHttpConfig = ''
|
|
||||||
map $request_uri $synapse_backend {
|
|
||||||
default synapse_master;
|
|
||||||
|
|
||||||
# Sync requests
|
|
||||||
~*^/_matrix/client/(v2_alpha|r0)/sync$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|v2_alpha|r0)/events$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0)/initialSync$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0)/rooms/[^/]+/initialSync$ synapse_client;
|
|
||||||
|
|
||||||
# Federation requests
|
|
||||||
~*^/_matrix/federation/v1/event/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/state/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/state_ids/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/backfill/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/get_missing_events/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/publicRooms synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/query/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/make_join/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/make_leave/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/send_join/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v2/send_join/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/send_leave/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v2/send_leave/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/invite/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v2/invite/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/query_auth/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/event_auth/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/exchange_third_party_invite/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/user/devices/ synapse_federation;
|
|
||||||
~*^/_matrix/federation/v1/get_groups_publicised$ synapse_federation;
|
|
||||||
~*^/_matrix/key/v2/query synapse_federation;
|
|
||||||
|
|
||||||
# Inbound federation transaction request
|
|
||||||
~*^/_matrix/federation/v1/send/ synapse_federation;
|
|
||||||
|
|
||||||
# Client API requests
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/publicRooms$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/joined_members$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/context/.*$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/members$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/state$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/account/3pid$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/devices$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/keys/query$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/keys/changes$ synapse_client;
|
|
||||||
~*^/_matrix/client/versions$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/voip/turnServer$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/joined_groups$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/publicised_groups$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/publicised_groups/ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/event/ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/joined_rooms$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/search$ synapse_client;
|
|
||||||
|
|
||||||
# Registration/login requests
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/login$ synapse_client;
|
|
||||||
~*^/_matrix/client/(r0|unstable)/register$ synapse_client;
|
|
||||||
|
|
||||||
# Event sending requests
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/redact synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/send synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/state/ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)$ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/join/ synapse_client;
|
|
||||||
~*^/_matrix/client/(api/v1|r0|unstable)/profile/ synapse_client;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
|
|
||||||
services.nginx.upstreams.synapse_master.servers = let
|
|
||||||
isMainListener = l: isListenerType "client" l && isListenerType "federation" l;
|
|
||||||
firstMainListener = lib.findFirst isMainListener
|
|
||||||
(throw "No cartch-all listener configured") cfg.settings.listeners;
|
|
||||||
address = lib.findFirst (_: true) (throw "No address in main listener") firstMainListener.bind_addresses;
|
|
||||||
port = firstMainListener.port;
|
|
||||||
socketAddress = "${address}:${builtins.toString port}";
|
|
||||||
in {
|
|
||||||
"${socketAddress}" = { };
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.upstreams.synapse_federation.servers = let
|
|
||||||
fedReceivers = lib.filterAttrs (_: w: w.type == "fed-receiver") cfg.workers.instances;
|
|
||||||
isListenerType = type: listener: lib.lists.any (r: lib.lists.any (n: n == type) r.names) listener.resources;
|
|
||||||
isFedListener = l: isListenerType "federation" l;
|
|
||||||
|
|
||||||
firstFedListener = w: lib.lists.findFirst isFedListener (throw "No federation endpoint on receiver") w.settings.worker_listeners;
|
|
||||||
|
|
||||||
wAddress = w: lib.lists.findFirst (_: true) (throw "No address in receiver") (firstFedListener w).bind_addresses;
|
|
||||||
wPort = w: (firstFedListener w).port;
|
|
||||||
|
|
||||||
socketAddress = w: "${wAddress w}:${builtins.toString (wPort w)}";
|
|
||||||
socketAddresses = lib.mapAttrsToList (_: value: "${socketAddress value}") fedReceivers;
|
|
||||||
in if fedReceivers != [ ] then lib.genAttrs socketAddresses (_: { }) else config.services.nginx.upstreams.synapse_master.servers;
|
|
||||||
|
|
||||||
services.nginx.upstreams.synapse_client.servers = config.services.nginx.upstreams.synapse_master.servers;
|
|
||||||
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."${cfg.public_baseurl}" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/_matrix" = {
|
|
||||||
proxyPass = "http://$synapse_backend";
|
|
||||||
extraConfig = ''
|
|
||||||
client_max_body_size ${cfg.settings.max_upload_size};
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
locations."/_synapse/client" = {
|
|
||||||
proxyPass = "http://$synapse_backend";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
version: 1
|
|
||||||
|
|
||||||
# In systemd's journal, loglevel is implicitly stored, so let's omit it
|
|
||||||
# from the message text.
|
|
||||||
formatters:
|
|
||||||
journal_fmt:
|
|
||||||
format: '%(name)s: [%(request)s] %(message)s'
|
|
||||||
|
|
||||||
filters:
|
|
||||||
context:
|
|
||||||
(): synapse.util.logcontext.LoggingContextFilter
|
|
||||||
request: ""
|
|
||||||
|
|
||||||
handlers:
|
|
||||||
journal:
|
|
||||||
class: systemd.journal.JournalHandler
|
|
||||||
formatter: journal_fmt
|
|
||||||
filters: [context]
|
|
||||||
SYSLOG_IDENTIFIER: synapse
|
|
||||||
|
|
||||||
root:
|
|
||||||
level: INFO
|
|
||||||
handlers: [journal]
|
|
||||||
|
|
||||||
disable_existing_loggers: False
|
|
||||||
|
|
@ -6,8 +6,6 @@ let
|
||||||
imap0Attrs = with lib; f: set:
|
imap0Attrs = with lib; f: set:
|
||||||
listToAttrs (imap0 (i: attr: nameValuePair attr (f i attr set.${attr})) (attrNames set));
|
listToAttrs (imap0 (i: attr: nameValuePair attr (f i attr set.${attr})) (attrNames set));
|
||||||
in {
|
in {
|
||||||
imports = [ ./synapse-module ];
|
|
||||||
|
|
||||||
sops.secrets."matrix/synapse/dbconfig" = {
|
sops.secrets."matrix/synapse/dbconfig" = {
|
||||||
owner = config.users.users.matrix-synapse.name;
|
owner = config.users.users.matrix-synapse.name;
|
||||||
group = config.users.users.matrix-synapse.group;
|
group = config.users.users.matrix-synapse.group;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue