diff --git a/.gitignore b/.gitignore index c4a847d..6609c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/result +/unstable/result +/stable/result diff --git a/unstable/config/common/services/nginx.nix b/unstable/config/common/services/nginx.nix index 89a13a4..4c1478d 100644 --- a/unstable/config/common/services/nginx.nix +++ b/unstable/config/common/services/nginx.nix @@ -9,6 +9,9 @@ recommendedProxySettings = true; recommendedTlsSettings = true; + # 100 MB max upload + clientMaxBodySize = "100m"; + # Only allow PFS-enabled ciphers with AES256 sslCiphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"; diff --git a/unstable/config/hosts/grondahl/services/synapse.nix b/unstable/config/hosts/grondahl/services/synapse.nix index 8e96cb5..9d0c32e 100644 --- a/unstable/config/hosts/grondahl/services/synapse.nix +++ b/unstable/config/hosts/grondahl/services/synapse.nix @@ -7,7 +7,7 @@ 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 = "20M"; + max_upload_size = "100M"; database_type = "psycopg2"; database_user = "synapse"; database_name = "synapse"; diff --git a/unstable/config/sources/nix/sources.json b/unstable/config/sources/nix/sources.json index c02530c..3f85426 100644 --- a/unstable/config/sources/nix/sources.json +++ b/unstable/config/sources/nix/sources.json @@ -17,22 +17,22 @@ "homepage": "", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "08cda8e3a5a4e685af525e5a589dfeb74267d505", - "sha256": "0bf3mbss7c3lyf5h8g1vwjbs0cg4h0c8ixbaz1kv24ahyy8n61y3", + "rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a", + "sha256": "0kz99f42173dh6sa7vw31vr4w348whmbv5n8yfylcjk6widhsslj", "type": "tarball", - "url": "https://github.com/NixOS/nixos-hardware/archive/08cda8e3a5a4e685af525e5a589dfeb74267d505.tar.gz", + "url": "https://github.com/NixOS/nixos-hardware/archive/4c9f07277bd4bc29a051ff2a0ca58c6403e3881a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-unstable-small", + "branch": "21.11", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db22325869a05e376dbab1c31ea7664dd5fcf860", - "sha256": "0pihqkl1c5bmb62657r38irvacav51ab0r4vfa2wn027ch1ry29m", + "rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31", + "sha256": "162dywda2dvfj1248afxc45kcrg83appjd0nmdb541hl7rnncf02", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/db22325869a05e376dbab1c31ea7664dd5fcf860.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixus": { diff --git a/unstable/zrsognwguwinm39ineqguchhtghs5w9y b/unstable/zrsognwguwinm39ineqguchhtghs5w9y deleted file mode 100644 index fc57b34..0000000 Binary files a/unstable/zrsognwguwinm39ineqguchhtghs5w9y and /dev/null differ