From 767d6c9a51198ff90db621c395bb1f0409d56e9d Mon Sep 17 00:00:00 2001
From: Emelie Graven <emelie@graven.dev>
Date: Fri, 10 Dec 2021 08:32:49 +0100
Subject: [PATCH] Increase nginx and synapse file size limit

---
 .gitignore                                       |   3 ++-
 unstable/config/common/services/nginx.nix        |   3 +++
 .../config/hosts/grondahl/services/synapse.nix   |   2 +-
 unstable/config/sources/nix/sources.json         |  14 +++++++-------
 unstable/zrsognwguwinm39ineqguchhtghs5w9y        | Bin 1698 -> 0 bytes
 5 files changed, 13 insertions(+), 9 deletions(-)
 delete mode 100644 unstable/zrsognwguwinm39ineqguchhtghs5w9y

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/<owner>/<repo>/archive/<rev>.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/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixus": {
diff --git a/unstable/zrsognwguwinm39ineqguchhtghs5w9y b/unstable/zrsognwguwinm39ineqguchhtghs5w9y
deleted file mode 100644
index fc57b3400ac550619e2a9f5563322da90476b234..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1698
zcmbPX%#s**+)j*Bn~jl$@s>M3BO|**%hXcUD|1)K&6=ckX6IFjrX!l4d*_P0VPE1L
zc42Z;ZP^w@*WA>c%v1&UqQtV)JO!InFxMd+%+*UtEwk&G%pxqt#bC`O&CJTp$-&Od
zD$2#l!Obeh#LURRB*(}k-XNyPB6c~i`u7Gl$KBt;edoU3n*U5-*F{#Q#K7YVm?Rk)
zxHtu1g08<A8LrE9KmBYPb;5%EVeb-$YdRYHSbylZi}JrOEeR-mJjI0JzpqqybJlF7
zmHARtPM3Ojf9C(p>r(YS&C<Cv`?W`h9bYG-F^d2r2ZOAbB8%VdRK10~nI_ARGINQ@
zzhA7BXFi>kDREZAERel0k)plq|3h7wZyq@{LE_)c`F5=-^M&TrJoKMs7qB%!>#wnt
z8h5+*?&CEwssXQcE=KJ9`&!%Q%=AYhCw6Y@b52TRQmMCem^H7t(<1orgJU;l9jUN)
zZb?^J<dLT>By#@2C+|$pum?`x<ARnyxVWPF=5EV0p`SfJw*NTa|Gz!`*xwl<JWF4!
z>0a60R~2ddMxJ+eX5@mVluv>|<~3>;&F0GQKKgaxOrI~^JYBJZ;)1(sjBV!DU1!@C
z6j{yqXzoUP;b}`x-&b3`Yo%CqMsh{-wp7zstFj&J-qiiw?X&JiU~C7Y@U^|qyp9F0
z)rtJ*`SIoPNLQa+=5@<!ea~CeoXpZ=wQ1l}Dw(=P0dH&<r`mN)07te3z8I~+lM+B7
z4vXniX$=2eDkmu@9s43^$F?w#F;r|y{H7cwnab!lHAmJgi#)nYkl}yC+eO+};{O)U
zT4pTj@?Bk4gQxMFxJN28>&E}(bAvkgiHhmDAbVjk-MoqYp8?;;TK1Z@#S7!lGkX?l
zF1$C1%kbuf{r|dHF0xMeey(7l&_=E)ks|WTiXYxh`gCvN=GV55CiEK|vpi=0+~Clv
zI4%9AA1bmE34-D$m*%Bxk@y*B)U;l+yL#eHG4T@zJY4toI5OQ6)9`(A@yJY;450-7
zTN|D7l!JCRz1|k##=N0?;e6d+&6>{b;k>MozR^d@E(Z&odGwL>UFNPF4Yt<Cmup_H
zJh8*}W%agKYbO1Ecs@S%z={5i%Z(n-Ryq}TDr@7jRd2Pg?Y*!utkbq8`)YOHLY3-m
zT_5XCDz0tiYwbCGeA4%=Zrw+8-y4<GE<1BSTH02wYM~C#{QK1tx9Lr3{WXPe2dFSO
z!HHTJEc>WwUGpc|Q|;2UQ*TdRHQN5uAm-QpSmg_*Cq89bow4tD&mtkl#h`#E@=tIw
zNi#7tBC>Ot0*j;=7dRhQ3OjDzcxu^$)k(Gi2L+Xja(9O=1Qh`%I6<)k6S;MX;jh?M
zK|iz4=9jm6+)2<rCKpst-Ld$d_=Uut(!JjM<3E`*{P*4)cT6)zNn)Ygq@_!~99_S^
zdr9W?s4sVuf4*9GZvP2}23AIfd&_>cq;?;?A--Trr&soy85>@_JLA>3{9Am>T7$(p
zcYZQ5w9aTbeXV`Dw5Y^sf!7)7&WjExisW)v-Ys9e_R5saJ6U&Fup|ba&==wY7n##T
z8CgMP=1;Yhtvc138_cJ#4Vv)a)rNH*IpUKegFGIH)W+AX?lEL$<Y4cp0|%8FzM#@)
zlICIMWO(bx0P;U9SGbEZGJF)&sERnmr#$C<TZMqqrw^tdR$P8IiShh}Sr2}(Uv6H(
z$Z)@#cb5I<Et{TY)f-<tCbT4p+dt7R>w4Co7u`pE1#a*_;x`O6ejoPk^_i<T|3amq
z|C<<V^#|Fj<Sw;r-Itom62JafU||X|jt*mzR={+$j3Oh$;=I3_kGDR*Q<)Kbc+cfC
z#|~EJn}58te!Kp40q>2Elgt?zK0UIoYvrlZT&JscU$HXdNJyQ#wAcob-*<i{$=%5+
GW(EMQGS!g)