simono41/chaos-jetzt-nixfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Apply suggestions from code review

Browse source
This commit is contained in:
Moritz 'e1mo' Fromm 2023-07-22 22:19:28 +02:00
parent b68e39dc87
commit 11b87685c3
No known key found for this signature in database
GPG key ID: 1D5D79A439E787F1
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
services/matrix/default.nix
View file

@ -23,7 +23,13 @@ in {
root = pkgs.element-web.override {
# Somewhat duplicate of the stuff in website.nix but I am
# not sure if we absolutely need to dedup this, just out of complexity perspective
conf.default_server_config."m.homeserver".base_url = "https://matrix.${baseDomain}/";
conf = {
default_server_config."m.homeserver" = {
base_url = "https://matrix.${baseDomain}/";
server_name = baseDomain;
};
default_country_code = "DE";
};
};
};
"matrix.${baseDomain}" = {
@ -97,7 +103,6 @@ in {
"fc00::/7"
];
additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
admin_contact = "mailto:administration@chaos.jetzt";
url_preview_enabled = true;
media_store_path = "/mnt/synapse_media_store";
@ -136,16 +141,16 @@ in {
# For our saml sso stuff we need to have additional_ressouces, but they are not possible with the NixOS module listener
(format "additional_ressources.yaml" {
listeners = [{
bind_addresses = [ "::1" "127.0.0.1" ];
port = matrixPort;
type = "http";
tls = false;
x_forwarded = true;
resources = [{
names = [ "client" "federation" ];
compress = false;
}];
additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
bind_addresses = [ "::1" "127.0.0.1" ];
port = matrixPort;
type = "http";
tls = false;
x_forwarded = true;
resources = [{
names = [ "client" "federation" ];
compress = false;
}];
additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
}];
})
];

2
services/matrix/synapse-log_config.yaml
View file

@ -1,5 +1,5 @@
# Based on https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/matrix/synapse-log_config.yaml
# Just with a log-level of notice
# Just with a log-level of warning
version: 1
# In systemd's journal, loglevel is implicitly stored, so let's omit it