Apply suggestions from code review
This commit is contained in:
parent
b68e39dc87
commit
11b87685c3
2 changed files with 18 additions and 13 deletions
|
@ -23,7 +23,13 @@ in {
|
||||||
root = pkgs.element-web.override {
|
root = pkgs.element-web.override {
|
||||||
# Somewhat duplicate of the stuff in website.nix but I am
|
# 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
|
# 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}" = {
|
"matrix.${baseDomain}" = {
|
||||||
|
@ -97,7 +103,6 @@ in {
|
||||||
"fc00::/7"
|
"fc00::/7"
|
||||||
];
|
];
|
||||||
|
|
||||||
additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
|
|
||||||
admin_contact = "mailto:administration@chaos.jetzt";
|
admin_contact = "mailto:administration@chaos.jetzt";
|
||||||
url_preview_enabled = true;
|
url_preview_enabled = true;
|
||||||
media_store_path = "/mnt/synapse_media_store";
|
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
|
# 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" {
|
(format "additional_ressources.yaml" {
|
||||||
listeners = [{
|
listeners = [{
|
||||||
bind_addresses = [ "::1" "127.0.0.1" ];
|
bind_addresses = [ "::1" "127.0.0.1" ];
|
||||||
port = matrixPort;
|
port = matrixPort;
|
||||||
type = "http";
|
type = "http";
|
||||||
tls = false;
|
tls = false;
|
||||||
x_forwarded = true;
|
x_forwarded = true;
|
||||||
resources = [{
|
resources = [{
|
||||||
names = [ "client" "federation" ];
|
names = [ "client" "federation" ];
|
||||||
compress = false;
|
compress = false;
|
||||||
}];
|
}];
|
||||||
additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
|
additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
|
||||||
}];
|
}];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Based on https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/matrix/synapse-log_config.yaml
|
# 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
|
version: 1
|
||||||
|
|
||||||
# In systemd's journal, loglevel is implicitly stored, so let's omit it
|
# In systemd's journal, loglevel is implicitly stored, so let's omit it
|
||||||
|
|
Loading…
Reference in a new issue