Bump to nixpkgs 22.05

This commit is contained in:
Emelie Graven 2022-08-03 08:57:34 +02:00
parent 41781e6a17
commit 8750d000bc
Signed by: emelie
GPG key ID: C11123726DBB55A1
14 changed files with 170 additions and 163 deletions

View file

@ -3,7 +3,7 @@
{
security.acme = {
acceptTerms = true;
email = "admin+certs@anarkafem.dev";
defaults.email = "admin+certs@anarkafem.dev";
};
}

View file

@ -1,11 +1,13 @@
{ config, ... }:
{
services.redis = {
enable = true;
unixSocket = "/run/redis/redis.sock";
vmOverCommit = true;
unixSocketPerm = 770;
#requirePassfile = config.secrets.files.redis_pass.file;
servers."" = {
enable = true;
unixSocket = "/run/redis/redis.sock";
unixSocketPerm = 770;
#requirePassfile = config.secrets.files.redis_pass.file;
};
};
}

View file

@ -3,72 +3,72 @@
{
services.matrix-synapse = {
enable = true;
server_name = "anarkafem.dev";
enable_registration = false;
registration_shared_secret = builtins.toString config.secrets.files.synapse_registration_shared_secret.file;
turn_shared_secret = builtins.toString config.secrets.files.turn_shared_secret.file;
max_upload_size = "100M";
database_type = "psycopg2";
database_args = {
password = builtins.toString config.secrets.files.synapse_db_password.file;
};
turn_uris = [
"turn:turn.anarkafem.dev:3478?transport=udp"
"turn:turn.anarkafem.dev:3478?transport=tcp"
"turn:turn.anarkafem.dev:3479?transport=udp"
"turn:turn.anarkafem.dev:3479?transport=tcp"
"turns:turn.anarkafem.dev:5349?transport=udp"
"turns:turn.anarkafem.dev:5349?transport=tcp"
"turns:turn.anarkafem.dev:5350?transport=udp"
"turns:turn.anarkafem.dev:5350?transport=tcp"
];
report_stats = false;
withJemalloc = true;
servers = { "anarkafem.dev" = {}; };
extraConfig = ''
default_room_version: "9"
auto_join_rooms:
- "#suf-aalborg:anarkafem.dev"
'';
logConfig = ''
version: 1
extraConfigFiles = [ config.secrets.files.synapse_extra_config.file ];
settings = {
formatters:
precise:
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
server_name = "anarkafem.dev";
enable_registration = false;
registration_shared_secret = builtins.toString config.secrets.files.synapse_registration_shared_secret.file;
turn_shared_secret = builtins.toString config.secrets.files.turn_shared_secret.file;
max_upload_size = "100M";
turn_uris = [
"turn:turn.anarkafem.dev:3478?transport=udp"
"turn:turn.anarkafem.dev:3478?transport=tcp"
"turn:turn.anarkafem.dev:3479?transport=udp"
"turn:turn.anarkafem.dev:3479?transport=tcp"
"turns:turn.anarkafem.dev:5349?transport=udp"
"turns:turn.anarkafem.dev:5349?transport=tcp"
"turns:turn.anarkafem.dev:5350?transport=udp"
"turns:turn.anarkafem.dev:5350?transport=tcp"
];
report_stats = false;
withJemalloc = true;
servers = { "anarkafem.dev" = {}; };
extraConfig = ''
default_room_version: "9"
auto_join_rooms:
- "#suf-aalborg:anarkafem.dev"
'';
logConfig = ''
version: 1
handlers:
console:
class: logging.StreamHandler
formatter: precise
formatters:
precise:
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
loggers:
synapse.storage.SQL:
# beware: increasing this to DEBUG will make synapse log sensitive
# information such as access tokens.
level: INFO
handlers:
console:
class: logging.StreamHandler
formatter: precise
root:
level: INFO
handlers: [console]
loggers:
synapse.storage.SQL:
# beware: increasing this to DEBUG will make synapse log sensitive
# information such as access tokens.
level: INFO
disable_existing_loggers: false
'';
listeners = [
{
port = 8008;
bind_address = "127.0.0.1";
type = "http";
tls = false;
x_forwarded = true;
resources = [
{
names = [ "client" "federation" ];
compress = false;
}
];
}
];
root:
level: INFO
handlers: [console]
disable_existing_loggers: false
'';
listeners = [
{
port = 8008;
bind_addresses = ["127.0.0.1"];
type = "http";
tls = false;
x_forwarded = true;
resources = [
{
names = [ "client" "federation" ];
compress = false;
}
];
}
];
};
};
}