From 8750d000bc029e8c619828337f8617bc97c36fa9 Mon Sep 17 00:00:00 2001 From: Emelie Graven Date: Wed, 3 Aug 2022 08:57:34 +0200 Subject: [PATCH] Bump to nixpkgs 22.05 --- config/common/services/ssh.nix | 2 +- config/common/users.nix | 5 +- .../hosts/grondahl/data/secrets/secrets.nix | Bin 955 -> 957 bytes .../grondahl/data/secrets/synapse_db_password | Bin 87 -> 0 bytes .../data/secrets/synapse_extra_config | Bin 0 -> 187 bytes config/hosts/grondahl/services/acme.nix | 2 +- config/hosts/grondahl/services/redis.nix | 10 +- config/hosts/grondahl/services/synapse.nix | 122 +++++++-------- config/hosts/rudiger/services/acme.nix | 2 +- config/hosts/rudiger/services/nextcloud.nix | 2 +- config/hosts/rudiger/services/redis.nix | 12 +- config/hosts/wind/services/acme.nix | 2 +- config/hosts/wind/services/synapse.nix | 148 +++++++++--------- config/sources/nix/sources.json | 26 +-- 14 files changed, 170 insertions(+), 163 deletions(-) delete mode 100644 config/hosts/grondahl/data/secrets/synapse_db_password create mode 100644 config/hosts/grondahl/data/secrets/synapse_extra_config diff --git a/config/common/services/ssh.nix b/config/common/services/ssh.nix index a454669..60dceee 100644 --- a/config/common/services/ssh.nix +++ b/config/common/services/ssh.nix @@ -4,7 +4,7 @@ enable = true; permitRootLogin = "no"; passwordAuthentication = false; - challengeResponseAuthentication = false; + kbdInteractiveAuthentication = false; hostKeys = [ { path = config.secrets.files.ssh_host_ed25519_key.file; type = "ed25519"; } ]; kexAlgorithms = [ "curve25519-sha256" "curve25519-sha256@libssh.org" ]; macs = [ "hmac-sha2-512-etm@openssh.com" "hmac-sha2-512-etm@openssh.com" "umac-128-etm@openssh.com" ]; diff --git a/config/common/users.nix b/config/common/users.nix index e39133d..8d92c93 100644 --- a/config/common/users.nix +++ b/config/common/users.nix @@ -5,8 +5,9 @@ isNormalUser = true; extraGroups = [ "wheel" ]; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICO4LyBsW1YuUA6i3EL/IZhchSvk7reO4qgRmR/tdQPU emelie@flap" - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIGRtSxLRqPWmsn161ybDFcMYxrBKhay5a485tlM8hQEuAAAABHNzaDo= emelie@thinky-fed" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICO4LyBsW1YuUA6i3EL/IZhchSvk7reO4qgRmR/tdQPU emelie@flap" + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIGRtSxLRqPWmsn161ybDFcMYxrBKhay5a485tlM8hQEuAAAABHNzaDo= emelie@thinky-fed" + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIBkWK8PsRh8tOz4800XFN3V2IUm2u95qOaVnuHnMknjiAAAABHNzaDo= emelie@em-work" ]; }; diff --git a/config/hosts/grondahl/data/secrets/secrets.nix b/config/hosts/grondahl/data/secrets/secrets.nix index 249edb2f002158783f59c4399986469a44e1dda0..b79d57c072b44ce1ff1701aea03cdf0e5201cd67 100644 GIT binary patch literal 957 zcmZQ@_Y83kiVO&0$iHQ`McZnB%QWTI;vACzlG9QnYi=|xnxA@Vk_=Vf2E1X`vqBu}@ zOHqv6gY^t$Q<}Z6O78g?HE;LPe*dtIY#dQv)ZKg*njilnwK##Z=gxL6q3|n7^W9I0 z>#fLjG@2!_Zw}L%v`^dW7dmGZ#pxe7lH+~z=9jt3lYcJU<@o001oa&;oO|W&+URPY zew4c7u*x4JuWd15%kRIAy!hzcHSgF@b4^6q>?bUED(&-zInS`#Kws$p#-%$sHdk4_ zn6L6$a!q}k+|h(5?tWfhGAzFu=g2^Aq7ThwbF>Ru3ZvyK(s6L*^}p=;-AE5zcpLL*}eT- z%CC^lVHZyrQ&l2P96Ro~ES9jH}!Yl5cZqhQ%>b8}$SR#K;VV?SFbIKJjjThyq ziHX0;vRX9aZ^u7Lxz4f6#Uiow$b}^;M+1_oVjWjZx@kQ(exqP0f8?}Ple#)wKb0-I z7N$P6(qTs8KQUj${`k3n?lS6pVRKbA;z{)k)-2t9Yehh|_;K0ip?=$r2t}1dr`}?_ zT_LY5ef90Dl!a_PH3w}n)lOxrZZ-dR_I>`1Eh47np*!}lM}6P?DZASzuYAW_bycy| zj4ku#aHLEYdZ>0r!BOt}v79-Nvc*1Gwj1Y4SZ!N(MebL&S4H>78DeLSwycz`uq`$| z&-MD(l76q0V=Aqkm(C?T+Mh2`R^_=S_QM_Po&~lJ&koG`n0D!7(zO`@Q~kf7sots(bF95O4L0E}QVq{@ohuO^YVy-{BICIebBWEm!7_lgl^9$;2#V ze51EPSbfi#DW&K99I~(Mk#acMpv6!){h~$ZmXa4oQY|)~G>H1S%(F@0jn4JfInjHT ztyeteWEfTZ@{MDZbxyUyA*UKHN40)+(Tu(QOEY-0%tgv&-heyzN!=a)*nB1_q1l9iQAnQ z+3&AQ`J}x#nw`G%^lXQJ?wfwC*{=3#f&8n&3ug}hne;}yS@UdwVoKQRvs1Urn4afK cP?~VGhS|(wb###L>-4hd)Hw$uI9t~P0DrpI>i_@% literal 955 zcmZQ@_Y83kiVO&0czkG~s>qce!g8%EDkAUJ2W*~D_O$aZ)x3pC zVaL7in-4s{r*dD#+I)gD({u4SK7-S&ZQqT#Q};7Ch)!R)Y-fMuOD#+Djba`S?k61n zrr!LU@^4?iCv5<9M)iuD!!b-}%iFG*p?84b2@o((zL zK8Z7rPJ4JN__>wjU6p5kUwnUBJvtKlUr4ffQRs@ZYVPyqStK4?Xfe~S(cAk(wnS7- zfanU@C9D^VHgEK2E;XNM&F=nzNxC7M`^Qn)(zf>3B{zMHZaWIem;HFOkoUl=u`zo}(8W3K?U-0j{^(PIF6Ep8g*tK6!6N}q;IPpU0 z$t%29Ed&Y|*iT8Gze{*Y=b@z~9}AvbGPf~Gy>rTH?(y#u-)(2kO1b>tiC~bhqF%al zX;j-2U6w0M+@2?7J3T@q(;b%moguuR#jmdK%F9ffJjY5fhEeAA`Yzc6 zMHj@SUa<0(#C>_ZcG=E_PxpSkR#m@{L)_v2q{MG(GDprtcCPxvCCHswQ6AYEe|OuV z39CC_UOSbu#7n%wy=+T*=j6#!KhhcZ>a=PI1#zAEBp`Fm=3uIX=7)-`Z8m{|bK17) zlz-TKa7x9k@B={=1zT<{ow}O$c~OSW&sVz^_e41PY`eDe)yv+k-689wQttm{m;8NS z|KR&#r-Ic=+2vL)Z#ABOwl~snxbMFG`uX_02c~Kj&kK&VT+qR?963}edb>7cWU=vO*4X#v4>{UGcxBVXC@NL+ZuCM`=qI94>ui{82Fd+kX|N zg1F1S--ot`@9%gYAhF17Qs&l<(>{XSzpt0Zy?XiL%ul`DUeC)c70$NWN!08~iU^Rr YTmL#UW7CWj2aYPfBLDq$8!t8j0KpN@>Hq)$ diff --git a/config/hosts/grondahl/data/secrets/synapse_db_password b/config/hosts/grondahl/data/secrets/synapse_db_password deleted file mode 100644 index c2cd71a63320dc7ed02275b19236d533922d8808..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87 zcmZQ@_Y83kiVO&0$myP&!FC}t>{Cj6!@U#x8u`j^sQh)h+tZ);$dzC8e#+aaS2Fh1 uRqcDt%X!*;Qpk?b*wR@laSz)W&3(5AG(KFtG3W2${e}T8y#JcNuLA()J1Xn| diff --git a/config/hosts/grondahl/data/secrets/synapse_extra_config b/config/hosts/grondahl/data/secrets/synapse_extra_config new file mode 100644 index 0000000000000000000000000000000000000000..c33b2c07368ef67cc0a009d15d4dad5b06988619 GIT binary patch literal 187 zcmZQ@_Y83kiVO&0u;x0hl9}l7q9tV7v1>6QeFi4sxwf90Y;@OO|Jb!b?W_EZUkB^< z&%0=UQu;ZI951>+z5Pg%I}ba0I//archive/.tar.gz" }, "nixos-hardware": { @@ -17,22 +17,22 @@ "homepage": "", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f4160a629bac3538939a3005c8b5c7fb320bcf59", - "sha256": "0w4k1fis534iafc72cjmig72697pz4s3fjj211fhzf443zh49in7", + "rev": "ea3efc80f8ab83cb73aec39f4e76fe87afb15a08", + "sha256": "0h87y6z42ch128j6yslydvdzajqcrqzhihi4nrpwida4js2pl1ak", "type": "tarball", - "url": "https://github.com/NixOS/nixos-hardware/archive/f4160a629bac3538939a3005c8b5c7fb320bcf59.tar.gz", + "url": "https://github.com/NixOS/nixos-hardware/archive/ea3efc80f8ab83cb73aec39f4e76fe87afb15a08.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "release-21.11", + "branch": "release-22.05", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "838eefb4f93f2306d4614aafb9b2375f315d917f", - "sha256": "1bm8cmh1wx4h8b4fhbs75hjci3gcrpi7k1m1pmiy3nc0gjim9vkg", + "rev": "c55096e021c6ab0be3945be2535b3b4324e4f571", + "sha256": "0smvw72cv80zq1y1y5vjfjbz0bv6mg8iznhv779s2vn5dz1s3kwx", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/838eefb4f93f2306d4614aafb9b2375f315d917f.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/c55096e021c6ab0be3945be2535b3b4324e4f571.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixus": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "Infinisil", "repo": "nixus", - "rev": "d1e1057a31f16a75d9f871e311c4aaaf664561b9", - "sha256": "0d4576dssr6l4vdpi86rbf6dyn3jfl3csvmn9csd4n6dj53f5pqm", + "rev": "a7b742f2f4c9d37cd84b8f0ab7ee57c4b3d9f393", + "sha256": "0pyplivs96vxnnnj3w8drd806xxzhrxcn969hh1bhbds4h4s5k16", "type": "tarball", - "url": "https://github.com/Infinisil/nixus/archive/d1e1057a31f16a75d9f871e311c4aaaf664561b9.tar.gz", + "url": "https://github.com/Infinisil/nixus/archive/a7b742f2f4c9d37cd84b8f0ab7ee57c4b3d9f393.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }