diff --git a/hosts/dav/baikal.nix b/hosts/dav/baikal.nix index 7f284b9..a09dc48 100644 --- a/hosts/dav/baikal.nix +++ b/hosts/dav/baikal.nix @@ -20,4 +20,3 @@ }; }; } - diff --git a/hosts/dav/radicale.nix b/hosts/dav/radicale.nix index 47b120b..4b045b1 100644 --- a/hosts/dav/radicale.nix +++ b/hosts/dav/radicale.nix @@ -1,22 +1,25 @@ { config, pkgs, ... }: let - calendarAggregate = pkgs.writers.writePython3 "calendar-aggregate.py" { libraries = [ pkgs.python3Packages.icalendar ]; } '' - from pathlib import Path - from icalendar import Calendar + calendarAggregate = + pkgs.writers.writePython3 "calendar-aggregate.py" + { libraries = [ pkgs.python3Packages.icalendar ]; } + '' + from pathlib import Path + from icalendar import Calendar - combined = Calendar() + combined = Calendar() - for path in Path("/var/lib/radicale/collections").rglob("*.ics"): - with open(path, "rb") as f: - cal = Calendar.from_ical(f.read()) + for path in Path("/var/lib/radicale/collections").rglob("*.ics"): + with open(path, "rb") as f: + cal = Calendar.from_ical(f.read()) - for component in cal.walk("VEVENT"): - combined.add_component(component) + for component in cal.walk("VEVENT"): + combined.add_component(component) - with open("/srv/www/calendar/all.ics", "wb") as f: - f.write(combined.to_ical()) - ''; + with open("/srv/www/calendar/all.ics", "wb") as f: + f.write(combined.to_ical()) + ''; in { imports = [ @@ -93,4 +96,3 @@ in }; }; } - diff --git a/hosts/matrix/draupnir.nix b/hosts/matrix/draupnir.nix index 84cae04..8b61845 100644 --- a/hosts/matrix/draupnir.nix +++ b/hosts/matrix/draupnir.nix @@ -6,7 +6,7 @@ settings = { homeserverUrl = "https://matrix.${config.networking.domain}"; #managementRoom = "!ZYWNuaQBkkenNklCSm:matrix.org"; # #cccb-moderators:berlin.ccc.de - managementRoom = "#cccb-moderators:berlin.ccc.de"; #"!ZYWNuaQBkkenNklCSm:matrix.org"; + managementRoom = "#cccb-moderators:berlin.ccc.de"; # "!ZYWNuaQBkkenNklCSm:matrix.org"; autojoinOnlyIfManager = true; recordIgnoredInvites = true; roomStateBackingStore.enabled = true; diff --git a/hosts/matrix/synapse.nix b/hosts/matrix/synapse.nix index 194ecaa..9a633e5 100644 --- a/hosts/matrix/synapse.nix +++ b/hosts/matrix/synapse.nix @@ -68,30 +68,30 @@ }; nginx.virtualHosts."matrix.${config.networking.domain}" = { - default = true; - quic = true; - kTLS = true; - forceSSL = true; - enableACME = true; - locations = { + default = true; + quic = true; + kTLS = true; + forceSSL = true; + enableACME = true; + locations = { "/".return = "418 \"🫖\""; "~ ^(/_matrix|/_synapse/client)" = { - recommendedProxySettings = true; - proxyPass = "http://[::1]:8008"; - extraConfig = '' + recommendedProxySettings = true; + proxyPass = "http://[::1]:8008"; + extraConfig = '' client_max_body_size 64M; proxy_set_header X-Request-ID $request_id; proxy_http_version 1.1; - ''; + ''; }; "/_synapse/metrics" = { - proxyPass = "http://[::1]:9009"; - recommendedProxySettings = true; - extraConfig = '' + proxyPass = "http://[::1]:9009"; + recommendedProxySettings = true; + extraConfig = '' allow 2001:678:760:cccb::14; allow 195.160.173.14; deny all; - ''; + ''; }; }; }; diff --git a/hosts/www/dav2ical.nix b/hosts/www/dav2ical.nix index 8b9a215..7e37aff 100644 --- a/hosts/www/dav2ical.nix +++ b/hosts/www/dav2ical.nix @@ -7,11 +7,13 @@ let ${builtins.readFile ./caldav-export.py} ''; - pythonEnv = pkgs.python3.withPackages (ps: with ps; [ - caldav - icalendar - pyyaml - ]); + pythonEnv = pkgs.python3.withPackages ( + ps: with ps; [ + caldav + icalendar + pyyaml + ] + ); in { systemd = { @@ -34,4 +36,3 @@ in }; }; } - diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 6d3876b..0b55165 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -54,10 +54,7 @@ in _sql _monitoring ]; - "postgres-forgejo.age".publicKeys = - xengi - ++ shokinn - ++ [ _sql ]; + "postgres-forgejo.age".publicKeys = xengi ++ shokinn ++ [ _sql ]; "postgres-extkuma.age".publicKeys = xengi ++ [ _sql ]; "postgres-baikal.age".publicKeys = xengi ++ [ _sql