From 36d81cb656345d7fd7f4365ea52c9a242c3b74c2 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Fri, 17 Jun 2022 00:54:28 +0100 Subject: [PATCH] nixos/colony: Configure for real hardware --- lib/default.nix | 4 +- nixos/boxes/colony/default.nix | 26 +++++--- nixos/boxes/colony/vms/default.nix | 60 +++++++++++------- secrets/cloudflare-credentials.conf.age | Bin 583 -> 494 bytes secrets/colony-netdata-powerdns.conf.age | Bin 577 -> 468 bytes .../colony-netdata-powerdns_recursor.conf.age | Bin 472 -> 515 bytes secrets/colony-pdns-recursor.conf.age | 17 ++--- secrets/dhparams.pem.age | Bin 1229 -> 1130 bytes secrets/jackflix-wg-privkey.txt.age | 18 +++--- secrets/nginx-sso.yaml.age | Bin 928 -> 828 bytes secrets/pdns-file-records.key.age | Bin 737 -> 854 bytes secrets/pdns.conf.age | 18 +++--- secrets/synapse.yaml.age | Bin 557 -> 576 bytes secrets/user-passwd.txt.age | 44 ++++++------- secrets/vaultwarden.env.age | 17 +++-- 15 files changed, 111 insertions(+), 93 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 9bdfac4..f3a8e50 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -177,11 +177,11 @@ rec { pubDomain = "nul.ie"; colony = rec { - domain = "test.int.nul.ie"; + domain = "fra1.int.${pubDomain}"; start = { all = { v4 = "10.100."; - v6 = "2a0e:97c0:4d0:bbb"; + v6 = "2a0e:97c0:4d0:ccc"; }; base = { v4 = "${start.all.v4}0."; diff --git a/nixos/boxes/colony/default.nix b/nixos/boxes/colony/default.nix index e2f5a04..7e28433 100644 --- a/nixos/boxes/colony/default.nix +++ b/nixos/boxes/colony/default.nix @@ -33,13 +33,16 @@ inherit (lib.my) networkdAssignment; in { - imports = [ "${modulesPath}/profiles/qemu-guest.nix" ]; - - boot.kernelParams = [ "intel_iommu=on" ]; - boot.loader.systemd-boot.configurationLimit = 20; + boot = { + kernelModules = [ "kvm-amd" ]; + kernelParams = [ "amd_iommu=on" ]; + initrd = { + availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + }; + }; fileSystems = { "/boot" = { - device = "/dev/disk/by-uuid/83CA-3BCF"; + device = "/dev/disk/by-uuid/C1C9-9CBC"; fsType = "vfat"; }; "/nix" = { @@ -63,14 +66,19 @@ environment.systemPackages = with pkgs; [ pciutils partclone + lm_sensors ]; systemd = { network = { links = { - "10-base-ext" = { - matchConfig.MACAddress = "52:54:00:81:bd:a1"; - linkConfig.Name = "base-ext"; + "10-wan0" = { + matchConfig.MACAddress = "d0:50:99:fa:a7:99"; + linkConfig.Name = "wan0"; + }; + "10-wan1" = { + matchConfig.MACAddress = "d0:50:99:fa:a7:9a"; + linkConfig.Name = "wan1"; }; }; netdevs = { @@ -149,7 +157,7 @@ my = { #deploy.generate.system.mode = "boot"; secrets = { - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKp5WDdDr/1NS3SJIDOKwcCNZDFOxqPAD7cbZWAP7EkX"; + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIijqzAWF6OxKr4aeCa1TAc5xGn4rdIjVTt0wAPU6uY"; }; server.enable = true; diff --git a/nixos/boxes/colony/vms/default.nix b/nixos/boxes/colony/vms/default.nix index 4ed02cc..c626689 100644 --- a/nixos/boxes/colony/vms/default.nix +++ b/nixos/boxes/colony/vms/default.nix @@ -10,7 +10,7 @@ inherit (lib) mkIf mkMerge optionals; wanBDF = - if config.my.build.isDevVM then "00:02.0" else "01:00.0"; + if config.my.build.isDevVM then "00:02.0" else "27:00.0"; vmLVM = vm: lv: { "${lv}" = { @@ -27,18 +27,40 @@ frontend = "virtio-blk"; }; }; + + installerDisk = { + installer = { + backend = { + driver = "file"; + filename = "${systems.installer.configuration.config.my.buildAs.iso}/iso/nixos-installer-devplayer0.iso"; + read-only = "on"; + }; + format.driver = "raw"; + frontend = "ide-cd"; + frontendOpts = { + bootindex = 1; + }; + }; + }; in { my = { vms = { instances = { estuary = { - uuid = "59f51efb-7e6d-477b-a263-ed9620dbc87b"; + uuid = "27796a09-c013-4031-9595-44791d6126b9"; + smp = { + cpus = 2; + threads = 2; + }; + memory = 3072; networks.base = { waitOnline = "no-carrier"; - mac = "52:54:00:ab:f1:52"; + mac = "52:54:00:15:1a:53"; }; - drives = mkMerge ([ ] ++ (optionals (!config.my.build.isDevVM) [ + drives = mkMerge ([ + installerDisk + ] ++ (optionals (!config.my.build.isDevVM) [ (vmLVM "estuary" "esp") (vmLVM "estuary" "nix") (vmLVM "estuary" "persist") @@ -48,34 +70,20 @@ }; shill = { - uuid = "e34569ec-d24e-446b-aca8-a3b27abc1f9b"; + uuid = "fc02d8c8-6f60-4b69-838a-e7aed6ee7617"; smp = { - cpus = 4; + cpus = 12; threads = 2; }; - memory = 8192; - networks.vms.mac = "52:54:00:85:b3:b1"; + memory = 65536; + networks.vms.mac = "52:54:00:27:3d:5c"; cleanShutdown.timeout = 120; drives = mkMerge ([ - { - installer = { - backend = { - driver = "file"; - filename = "${systems.installer.configuration.config.my.buildAs.iso}/iso/nixos-installer-devplayer0.iso"; - read-only = "on"; - }; - format.driver = "raw"; - frontend = "ide-cd"; - frontendOpts = { - bootindex = 1; - }; - }; - } + installerDisk ] ++ (optionals (!config.my.build.isDevVM) [ (vmLVM "shill" "esp") (vmLVM "shill" "nix") (vmLVM "shill" "persist") - { esp.frontendOpts.bootindex = 0; @@ -83,8 +91,12 @@ backend = { driver = "host_device"; filename = "/dev/hdds/media"; + discard = "unmap"; + }; + format = { + driver = "raw"; + discard = "unmap"; }; - format.driver = "raw"; frontend = "virtio-blk"; }; } diff --git a/secrets/cloudflare-credentials.conf.age b/secrets/cloudflare-credentials.conf.age index f1177316da50a9e6c043a7aaaf98aa0924f18db8..97f406cc7a4ba674e22cb3dd8ae5217744e0432c 100644 GIT binary patch delta 460 zcmX@k@{W0ePJOXgk$Zq=m}yFtb5&l2ySqubd5EKHVMLxuQChH@nYWQ|WLA1rfm@nK zHdnfKP-d~0c~xmvepY^Anzyl0U_q2$n0B#+lT&eGX?T#Efk9?|plg&{F_*5LLWGg2 zsiCDpWo1fkxIt=CYGz55eqv}e9pMBc$cw@bJ6iFyw-c9tB>y8dil2{cizpol)&;|5y__P Fivg~^uYdpm delta 550 zcmaFIe4J&1PJNJRXmPqnxwCmx_1o2iGnepa|+Qea|~S(0gHahi99Yf(vdD3`9CLWGg2 zsiCDpc3_rch<{SKTZUW1lQ%Cl@X+U(a%LOFs*f^n7>!4BrrUKi6dKl43vqqAH)n zGS^@WcPCfJ;;Mj@;Is%MLz6SR*nZ9nV4zIADY-!{nC5^gjmr1iDC0XaxJ&>Mi rse5USguL^WlAh-xkKg&Nes+KM$}rK`wOTKCtvO*Jv8};9I`AF<6dlUP diff --git a/secrets/colony-netdata-powerdns.conf.age b/secrets/colony-netdata-powerdns.conf.age index 44ebc0e33246bd10f6915b416b03db25b3b77aa7..ef867189b90972b296d15928bda3b8df9e803280 100644 GIT binary patch delta 434 zcmX@ea)o(N3*aY}l2ReqMalef8LpmU%{RGL#_aJ^ZuSz)D9c2tBHhVVp2q9R$!ICV{(30Ubb;SsaJq|aJsj%fn$V$ab$R9v5yzniWn!|^rF3?G}f!bPod8(pugQ}HvJxt}Z2BV6k%fDpn~{EskxyN(c|@vnSyn-As8eKsX?eDGpqqI`x?i%VMWB8@$OCa<@>f&@zLp;8g#-@B$~Vf~-taA19}*;-KKt zl2FHb^X!V8l8l_N(yE*Q3j@#G#85Z0oSd-q^mNk*Z&!0ie-jg96RtpyVrQQu?c#Jd zql}^w$C8lJBI7*6+)VG#tfWNCfXtLqec$3NS2KTa!(c95U0sF50MAHY*O0QDa{r7X z7r&G;H`ipRGUL*y2(u7N6N3=vs^qdr3wN`6{X|!;b#8%^rrGZ*Qo9-wwQXPKqww!u zXG|~cjclIS{$sY}Ri*6Mvp$$TdyI~YFs8$G)D%vmbs=;geO z-sLJ!T%Eo#daEQ|OgF8n{wb`@V$UOBlNVS!A+thnMpmGJH~_4($b0|* diff --git a/secrets/colony-netdata-powerdns_recursor.conf.age b/secrets/colony-netdata-powerdns_recursor.conf.age index 61cf8f8fafb93fd39dc32d6e4ca8bba79c4f5482..cee3f7314fbffc8b6cd676b1ce5b5655231f19f6 100644 GIT binary patch delta 481 zcmcb?+{`jTr@q9+DIh4q+$Ar!AhNKc$|OCaEX>j;%AzDUC@LVt(cLV+!ZpM_Da9Z( zl*`1TB+awL&)d5qJR~?R-6h8*Uq9QdAjc^vGBY#6*D<)%*~h)2EZ^B8olDnFA;QSi z)X-8PI3yq~BG1(*tFk;bs;t7)+^Zt5+})?pCnzJ?vfeDzsmvfC)YL1Z+{xL1t0cUv z$R)?pC^6F2-`_WKYGzf1Hdld(hp%@!m#(g^LXkzVyRoxtP=t?mdStRel2M9BSx{&| znz2_=xN%mbk4cJwae-U1Q;A!x^PUyDWI%n>WTF>%Tfi|E2=~!Rv3K! z`2JCv-U}Q1$l1?dH?5!Wefu>pZj&c_GqVKmi(5uz_OG9(a#zRy%l0OY39EKKyt8fg z1?5<7^}2$^XFh$o*5CZUxLd7carIfFIT1OkOHN3c`6MKEZ~wTykMHrHlA;vFXPRy` aYE7b-=XomM6p?ZC|5sJ)xFEzKVm1K06Sdg@ delta 438 zcmZo>xxqX^r{2&tDKyiisLau~LOa{fI4Uzu+s`mHG^4^f(8tR)B{#%7s<@!sBGARa zm8-a_EWpIqGCatq*rzH#G%3T~sXSLZ+r-q*CDO^WGR!zD#n{8o%_%E0kW1H2A;QSi z)X-AFt)#*`Dbm@f&@kM~vckfjn zw>Ul7G}j{{CoE0d#l*9sI5N-7z&9u=#ml6qG9th`EYdYNGR({sWQAK^dPRzEdQoa( zajHU%XI5rNmVLfLbg8|Ylc{Bhf~vAj0heo4W_DyCm#(g^LT;6Ns#~#vYgK7LfS0GA zXJlc0l&42&Xo#1#S!t+2VV<*gy1So~Nr6$O0hg^n+a5=A*=@Hb#q~G{Ng2&`yJIF4 zb$5CGk44dSnuoO+4E#$(dijs=M{EzuIC!pdjedJsonhyW>P-xXx#C6d$eHy^%{#5} z@a6IM$^o-JGc1c!Qj2j{((`CA@bc*k7gs;{_l=tVzcTk=#)P=7^V~{LyjlG0P-698 h>6P2%I#@#04Ff(aC7$A(96V?02d|3i#XHjUnE`OJos9qh diff --git a/secrets/colony-pdns-recursor.conf.age b/secrets/colony-pdns-recursor.conf.age index 7322257..4de2559 100644 --- a/secrets/colony-pdns-recursor.conf.age +++ b/secrets/colony-pdns-recursor.conf.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 B9K/XQ gNJl6io3eASmXNRrcLI3fH8UqNEeT7vbCVfks9D153g -/APb0O9268pftfeV5XY1E4CcKrCBAO69sVUBM82cmvE --> X25519 xskN26oeA5X3rvevlBvyzz/fylb1SINSR09B+DMvSCo -hk5wowfDfxjlFjQKGLwOfA/bgB2cuHR1En9hLtGcsEk --> sK$y-grease `L hNh -RvgnmIYLnlj6Xzs4YWg40UXHPJrnRHzR/c+X1bg5Qby/Zg ---- 8IqpUilyXUPSp+KdSCCOBN3GRWtciEjmi1bxzzTmC78 -[?RNvO5yŬ?+XB ;~!uXm95?UDĪupф_hc \ No newline at end of file +-> ssh-ed25519 B9K/XQ pDr63Mxy93vvgTOOeGx+P2olj58AszuoW4DMU/2vwTs +q0BfZmSo7PTHbbwX+8BdbJNiOjHflEsRVRyb96CCfJs +-> X25519 wclqj46DLlI26z5xVt2FdTzYI5QUrZAu74y3Hgm1j18 +WpK4K+hsmxjVKGbt/NuC/Khcw1mSH121AabF0fsYLVw +-> t]-grease fmXI7F 0vP#;w * +mlRT87J7NtBKsK1lsNBArc9Ofo92Yniki5o3deA +--- k5dfRl70t63RfTENRTTgBzgi3lm0D26KFkj73tyHMBo +jMޚy-?h3kWv{M~P[aCCj(٦elRPJ%V&[ +62ԣ. \ No newline at end of file diff --git a/secrets/dhparams.pem.age b/secrets/dhparams.pem.age index d302214728744a42e24a51a7973506d9036ba592..b55cfe06be1be4afe61d8302e2f854dd034ecc92 100644 GIT binary patch delta 1101 zcmX@h`HEwLPQ9g5URt_gqL)!frem&aRZ^&Pc!sBET1ldRo@q$BOQctMxj{~Adsf$T^QB|d*WoBwYRZ@A1advQtaYc%yaj1nS$cltPtJw zqSVCVRIWe+^Q3&UFjp6szzXLalPEtwi%`>a_ww9Q^CTamaxPt6U4>LH7thEbPcsuo zvxuVlleCXmAD*t-943Fl(r(`^w^DwI6So&J)fe2mf9|;K5;+T_CmSCAz4D5+ zW5&5-E0YWsh5u3BUYPOr75_ngk9vzI|C4t5=Itt%{Bvna?Xo|dZ*O0FX!5Fdk|*~h zyA8~1Hf!@PxiO>b=Hlqu72jAnGdF9!e!01${N?l`?YVj@j!Djx%35yfTJTy` zxaiQbX(<5OO7&aq@+hS$dDclrHZ)b@N2(-k`I zdTCN-ul|Kwl8sq61y*XBEHGeyxh{C=2?n9_Q7c|pT={iz-|=NGSNDI+*x+sD@#)>s zPpVfIZw^1-_;zP8r{>wC?e_!x{`?UB9C7;GRpIH03`;9p)(SKn+4qOHuRh%M##1Gk zkKBiiJ3a_3R@i*u)1$mo0laRO1@i)>tY0YXVP=nA+qmG@ITIeKwvCcc|LJQVc+xN} z&qCSFNjh+W)a^*NJDYzqO`cyNqW(i|zeKsEm+yqrwuxewf-SyZb=b=tCwA$pm!a#5 zJC3W4R_W$sy!cYbyqWX%@2_9>eRr>^_gKbM8xv>Mdq_v-+4&=rn4RR#>+gJ2!#dfg zFVi+S{~*ur6Rr)@Kg751@e+J9dj*HeF6q=MkA)Zh3weEk_gDOlP7)dBXK(sZ@7vWlK|G zNgnN_p8JZD3+gsV$j)uI@L~@a?%nY@%{imU^6&nY{X2|L_?}yNzVFrH5^hGjzcm%= zWj@KDXQnSrE%KTFdda(kCK*@R^6o`G*=$+9)Z}Tdx!bMTh5I>r(<&cqcVAhOPrFQb7 H-7O&ii8S;T delta 1201 zcmaFGah7v}PJM}XR#0MqQNE#RN|aG)eo<6@UX(?-seX7wX0fA7sZm<4ex-$RzP5*Z zK9_-Ss&ROlpP`?2s&|revO!p+k8z1%g`=^1NJM!~N=RODU}%1ok*BtHGMBEMLWGg2 zsiCDpR=&4oqO)gsd2(V#mbZSCLnQ zr;%HfhgqG;Q6sMr92n!=0SBvzNKua!5zhcXb;3Ds&+`uwJ=ODKt=PF;ns<29Z{VK0Y z4?lC$N(=7_v*JL;2;;@l3bHK$4LG9VgoKsjVAHO8;(8MzuvO1Ct~BeHN_2+ z&FlYjh90|J#do0XMQC^YoyfdA-qxj4O-|jdiA&)Ao?LaFW!5-)>)>dQ`c8F-Pm6?lsp!IJK=x zBBZ8ziq-ArT+!YTNzTnw@^^{-n4w>_c77EkP zy{~qgTmSB|n#`X6mVJ%vFO9A4#U8(?xK{h?+PZ0Ln4D^5gc9sF={8ZkwIr>=KRF@A+pen`_L%u;;5$o}-Y}N+HwxkM3nv35CC!K7VTFbS6({RXz>T z8MAjiw$2FpsOJ(8!yWKXia+B1mE>1i3!bwFh1;Jy|7o<-qht z^VC_PKa>|7J;(Gi*iME*+f3=FZwI#0R5QD_WS=Ss7=J_XgGjKor#&c?!ePzU6x#wT}!n2aY zFZZoD_uD(^QuyU?yN_OO%Z|Km@NN9Vw&OcXwkGS(u02PDXHFNqYV|2RTRB(c{{5W~ zpZ{95b){(cXU-0$@A{JACSQxz6`5?ZWV~EIZ|%E|0@x{hQPK z@$~(;Hoi1g3_$~0HTlrGfM=Qd%DeJ@shUYB)8GI&e$6Ya(C?AuLTc)=ZmYXfT z;&$Hf#6qoq{yr}ST*ED{9@wfY`i}d;r0BKfvy3(`F_t_Ld|23_uc0%zzy0PpKCM*% Dp8ggw diff --git a/secrets/jackflix-wg-privkey.txt.age b/secrets/jackflix-wg-privkey.txt.age index 03dbb6e..07991d5 100644 --- a/secrets/jackflix-wg-privkey.txt.age +++ b/secrets/jackflix-wg-privkey.txt.age @@ -1,11 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 vf+WVg urUmX8GQaZ9N5s4im5LjHdrqF7G1cUmOhRwJ4C6QiDo -rgzuokfwMMjYtbPBCBNa+9Jg4QHbdd4ynqrsVX5LSWM --> X25519 Kr0gKsPYyLt3PFVZlv6m1NlLedJJYxSNKvmKx9canyc -1Ki72qamPIaor+FCYy0SLVSm0GVCVsjFiRteSNv5hCA --> MT&kccY-grease k k>D#= -/DFm:' ufBE\ -1HfnD0ef5OnLrhBZL+pyaMVLjCadk+vLszSORTxyarFPKD5wqor5nPn/mMLotY79 -mpKSMQq8ehwB+Ruv6fjys3q/1A ---- J8tifBtzNpEgeFqTxpfq+Md0vdmzU23rizI3C39gkc4 -29A7JȔ،\r=Jwx xlՕAddԬQ#rɚ}ay0Pl& -dF|- \ No newline at end of file +-> ssh-ed25519 vf+WVg +Ftq3XX892mQ+cB1nPRq6eDP7HPdFogZk/EbIsuxuk0 +i1ihGVigQBA7pquuXO3sBABSXN9x8IIJ64sfiNQ201w +-> X25519 YB51ze5czSe08S89gtTWQ6zuxoMJZi5+23S2GXCXT1M +jlLwxefYiijkj4JH4J+sUVJxhBWYfmbGjwi3B57vphU +-> f3mY-grease w kU}uSw m_ySQ R+ +t7aJI+DNE57a0chgz08QlOIPpZyudJ4EjGChyO0ct9rQkrT87AQ +--- vugV8UZzBLfeLBlFPBfiLAo1aaU28p1JLNyyGQkztNs +W4)5-f5c”S8Q]36~)JjW{ K!ϰ!H3(ڠ=>w| \ No newline at end of file diff --git a/secrets/nginx-sso.yaml.age b/secrets/nginx-sso.yaml.age index 606dd6d86a3e43fe9d4db15b9284632ebd0674ca..01e8ffd74b3d8e8a89f23b40ece10b1f79d94085 100644 GIT binary patch delta 797 zcmZ3$zK3msPQ8(7iFulKN{*S2dv;QIN?LJZL||%el%=bGnNML@pnGs$YLuzDc~Ej* zIhUz#eww9^Q@Vete|lDCxk*}fMp~r4XK<8Dkyk~fzLQJ7TSZbqUS?2uAeXM4LWGg2 zsiCEUPi1n5cVxMfWn_VVK(J@HZ)B;9SBQ_Xey)37Qhiv8mvgvwS-w-CX+fq5m#2lL zyLM*2d2X0zzGt#Wcv+QcM7E26kb#+LQA9P#+C*s~Fw% zqSVCVRIY5((1M~$bJK8>l2R8(lZd3`&~ndAv+#^^E?r$+g~F=faQ8enOUn>bL$`pe zkkXv`^s4OiMCYoU;H2Wxa;HF_vPeT$%g90#Pp*%~iIGuCI~@A>-Oao2KDzMmyG!?l zvtknAR>I}?C-~nNfOAiWfXQt#)~Sth7@hgMpdvbW>T^`&qu5 z_GLrLi@a(@SH& z%jqrKbDPuyPON>;G*9>fmt4aE1?4L_eqwuvutjd7aa_H#-N zTQk&invAa>N{unQ-2HN8|C|G}93H)?i*9axy(#)#=ZQVoas=6#~{%);) z^To$jp1Qfg+P-$h>?2R-?ax;FSS|XzRaI8s@kY&zFRfmA((Z*?g6VC2>$9r4nUf#dfO%bcg4P4H!*Enjg43$W`HQlh7 xb4r9sp*z#EO z5M;1KVu$eglrj|d~r z2t(s^ACIEMjPi2R5`VL-V#DN&DmROwK(0si59i$8Ftez*ByY_TrFkZL9$_#1@@?Ft zXFuvUzSS7k{N>HOO~q3uKAzBW_*rHkQ`xD@CE`+Vf6Z;wW^32j6m{gD?mw%h>`#R{ zZoj&ci#M3XOo`Te=gRQ%NSBE9#)|fo+qpS+D+@#Z?A{pT)*&}RmvM{ zRAOExKXQ0j=E(OiTC(AD%-v=&>3vCdYd(n>rg$X!{QBV)9rz|-%QdxvZ&mI!#&H@u zr>1<?^1VZBYUrPVHS<3u( zops!7VP})H!+Oz$N4`hR!ek45?^gC7P+V9nASDrTVYyTKPO3b0wN91F>?-LE##7IjFD>{QAM<;nk>$}H;)iQ5`Zs$W>u7u!uk?1~ zxsOb0T2o(sF3XHqdgq_xk3gN5bJTn?9{<~4HD^I}bwu6t^|Jr&#h+Sx|0qLgY2cTg sW?DxV&D2vrWWIN`(t%F>H;I~`EUMIhY2>RMyqC7MyLg?D&x?|402Z=PwOl#5APvQvq_d3|PPR$^61o@0PPu}4@sm$_S- zfp&mtluv11UPf79VUl;6Ur}+ccXn}^t6526VPIBxrIC|mdX<+i$O_BEDBbj;)WqUc z1r3$J3cp~5r~sAFDs_bd<1ntObPuB-vl3U6s(j;ABmeA@kPySb-~j&u%P=SN%<^21 zf;5YI7t?@5CyzomcVDAIf4@NYG!LgrpJX44678a7E>owh;xu#1>;TtrBcD|L2rpOT z;!5qjstQw&01thO@FGVpU0q!TQ~fZHBLCEKH!s&hql$c|aKoZ9BgeEbN9WYg^!&uo zG;`k|pOgU8^5SAH&i5&*f_o10il*<{kl(Yhey5M~|Lb#gZ@0O>NWLHP(tJ}mEF27cMT^yj4E^ws#v>(&E*|!88?`CpO z`*V5!sRag(8SC%I3JFdRvdT0yJlv2v`?0C#nYe62t;3VGf7Es#+wzUA`c8}L+={&3 z5H~d&36c88&Z()jQw4udYjP>HzPDU?F_%T!F}oBN`yJP=q@BDdGV9O;g@1F_G?`52 zYdbna#JSQ*DSyv{sq_E&r%tc<8^V_0eO-H!&Rew$k`cYuUp{ee6Z8uzW;YI)TWx!4 zt&0EkqgCz}E)(V^u%?^+fBX8_yUUk_!#vW+F+T0EoO z<)-p{AD=7yZ}Usz171j9YOwgRTm9^It178Bk(3qj8-mX=bQ}DrRo=Zq=!JmkjN?-C z_j7q`WlZ{1d--K{nK(DUfmmr5TU;lP)7b@ajm_^DKiR(4$huKlqj&YGtq*6&y*Jz- Td-PjJTXV2sL~qZRyjO<+^`%#! delta 705 zcmcb{_KMS5vfNmxjFWJ-RPMWBH}epp=+tPZ(5#-k8!f4hl#$iE0?aFLWGg2 zsiCDpYDPw|VYr*4U#W>xnNewGYLIqPNQRq*o4ap%L48$@rD#dqqKCth{$qnv;5qMumB&6e3t^l)HHL)h~V5rb1!F$OQJ=tDWqfhKlNvR%$EA3{Qwg}M3LNjI%oBmJ+v4c~jNC8%lrO&JMakzM8;=k{OJo0hs` zW7{Vk1!1*IJe}LlgrxqIu=mZLxBkr3YZbBk`kWVy{=~pjJ-4Ihku%ErjDsvvetrQ0%w}*8IqJ%D~Y=-3W_b58xhDY ze{KF_47j4&yM_JnE(77mizL3Vue#Zpz?i){_(Egl&X?0;-xh3)y30`? zwfuDy?*`k(O|zJv#_a#Sc)O1<+l{I23Bl`L=^x#*SU9PBiE47$p$wbdRw+7rWDkV} z3Qzpl_fxfG9=G%L3wKYwIwZmskRK@+S{{?^sDJHC1i$#v%NvcNt2f`W?_2E_ZXN5x GS^xk^V=cx2 diff --git a/secrets/pdns.conf.age b/secrets/pdns.conf.age index 7f43350..106db85 100644 --- a/secrets/pdns.conf.age +++ b/secrets/pdns.conf.age @@ -1,10 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 B9K/XQ /kv+tjtTxUS9If5ognIwNC3TmO+18KL0nOEkxy5JGz0 -LHbhmFnFFMckiK1dRtJxfy4a5ZYUkBB8bpO8IS4WWtA --> X25519 cxHRN7s0xsX3ZPJcJ5yaZ4fVwAfcWJx8sx+EqXyKiHw -kJK3WRVizmL8b8cgfRFs0Em71aks0G8eFBHZeLJGWsw --> 8!{=+-grease 7N}9_80% GL[9 }#I`Kx}) mJw -PFJMFv12BxUgTzf305i+dqevE18VzMjjdUYtaLRc2GW5PDGEhUf58HMWsqKVSTwu -CSp9e8dSNE0JqEDR7Y9vkHGmEsoTP/4 ---- zz2KJqzb87axtYxVRiUYyOxhK2vVQ5C5oa++Jp43Q58 -ɲ-Ty$zueP[j#=bi#DJ;:dX-ڴ)?)Kv缭D \ No newline at end of file +-> ssh-ed25519 B9K/XQ RPTsuo5LXtXQ0yRf4lix7nOn48nJawJo/fv3mYZJfCs +FTIAc4/v/TQipi5I4KaOX0GDksh8TzjC7eSAl0tIOBk +-> X25519 pWMx1kfOtpKjB2v0nxlxsxMAgNTUcHlwd/P4+1KxJh4 +hgBRp0O9u9g+E27L+gFwNQQO8U9CTpO4wimbSrw5xGA +-> E4fsjus0-grease ?9*Pp +%i8{y +2RUCSOqmenVa1VlGqIXGuFcs8tbJavzHAqkIeMKVRGhE8akkRwAluTvXMMSD4fXJ +MqXGrxz2CpkwsUgq1nV80GHpQP6a +--- TXdOf7GTxBUBkH3NnM+BnXif8xbGDf4xxPgHX/oTyhk +EƾZGT%}^h!.55uxxHRȂV셐bcu3P𣜫kc$NI$m2 \ No newline at end of file diff --git a/secrets/synapse.yaml.age b/secrets/synapse.yaml.age index 03dd30066afa2cb317494f0af4cc2166b6719841..a31d18b78c82ef4646988156f8d7fea78afb7254 100644 GIT binary patch delta 543 zcmZ3>a)4!mPJN((Z<1N5qj_?nOQwfKL~fd;VVPxUd2*FWa%Dw8RYkbAr<*}(Qe{M5 zF_(#VZn$5LS)r45wug6!S%Iaqc0{pRfvIa~P?>qLlS`t0YGkpuQHr^NE0?aFLWGg2 zsiCDpm|Ll7Qc93TdPRVLx@D+=lW%xwL}i|vw{J?7UwvqPXla}a|5oj!tk;}6E|n~LTy(|U$>B~oS?ka^gMTcU-N9wj1EcU0q#;$h^W*@6-U_j3igbsI*Ymg2IYa?@UXx@ZzL!bJL<=3!jjr z0w>GxbeB*rmx@;#Ww+c(c&GK|ul0M`4$(xn=1nq3O0RrK)z>k-s~(#9GiVuwc57!_^0aa+iYX9ANcO7 zNoOs4D{D95YJ}qQi~9dG`b3+r7l(7d(RlS{p?IUYlBIsqI;JJZs-HV-*wxO!vaE}H z+cCvkkKa}ob;oPE-{Urvu2?mVIr_+k%2PkDJYw$`+GLZ|JZ(;*frv7P_u8J`wFj49 o%Ws}{De%7c3WsUSXK2dAV`1bE#*bWu;eASh;sjD3`9CLWGg2 zsiCDpL10;ir&pe9kY!3Bnm79NBS-FR{NqvxOYLH*1MR7rhr%zQjS87yP zT1Hrii?OL;l&7niQqtU{M)g}`7xuHq^)Q*Dc|{189ia{o;4VpFdm{Vdb;aNl$;U0q!T7x(1M z@{pYRC~XU`C?BUJN7smopenqeHl;f2+S>in!HYP@zk+m@_avbp-_QH9!OmES%SHh;Cb z*!;BbW~fQ>;y|Pfs?WRP+C2T^?uQ0piiW~AUVpVe z>uTKkv~hpht#5`u8&+AUP1v)}_02sAts}cmgw;3OWP6FS|51@N+qI{vuW^Y&-F|<= z#+ZNZ&o;VTaXBpTabqc`%-@;L^S(K6}myy|QlA-g4b=T*kzX}11Thea; diff --git a/secrets/user-passwd.txt.age b/secrets/user-passwd.txt.age index 33ab7cf..01a1b74 100644 --- a/secrets/user-passwd.txt.age +++ b/secrets/user-passwd.txt.age @@ -1,23 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 FAIX7A 9lwGzxHbaj59re00D+VBn31xh6lXBdqlocUWbuGl0lk -WWXUSz//VWPGWwNRNDOY9rNZHEMj74gJDPyPzntmONk --> ssh-ed25519 SKXJUw 9espI6g1Y0xAOf8RZaYTnw6Y7YSTN5Wv/9JqHMOe5Wo -ZaujblPPK14BYY67ffHCmRg33xljYwl/4YygG9efKQc --> ssh-ed25519 wbGjmA U6GrN0iOmz77kOwa1VQ/0Cn7v/EiAJh1ZUOhJuqloVA -xB8Uu6+tVXNbAqCSkHYMvBla/oJA0nOHayrHtN4yCGQ --> ssh-ed25519 B9K/XQ gMQEYYshD9fFvI0vrUER/2OWZYRICGem5bX7ZIP16kQ -9QwTY23a5C8TZ+1wUeqYWLWM4zSQNNzUoaqhkhQLxG4 --> ssh-ed25519 vf+WVg 3MU9AIwghf/IDoMuAZEX3GuFz1w7vYtSso5I5BDY/hM -b1U0PexxCj4DTQB41bDi6bKktoOiA+xDDMLZYPHCMlA --> ssh-ed25519 H162lQ 99SwlUFFeKMu8VH2264WyjJVugRKYcAFHF2aHtCGyE8 -LL2cJEdKtqrylLZWQVCoZQ9bGkCD6xPeY0K5C+sMrm0 --> ssh-ed25519 b6YMqg ME2+OkaFz7ZkAy4izG26lmYMl47AF5NZFojEhawj0nU -FsMXB4ymF0e/FyySdEjE3LAJw3q0Ax5BQk9m0Zsu4cg --> ssh-ed25519 Lqn0Yw CwGVxMt//mUhJp2Dv1juO8oWFVNML0Q+zTqsqncEo0U -/YzScABKV/949EQnf8ztFzNQGzjGOWPj9iXHy2uFDYM --> X25519 I0lKCScunZXPMiHBpGhFa7nAGFg3NeAslOdutKkyuFo -csAlkN1jWUbUxlWRF/mAX1TT95ZU7iTDUa7uGi3Gtjk --> Q?#-grease @c: -CXkWEsR63Q4TflQd95UiFCazSFterOzSMmqRaCR/uQBhUEkyPc0 ---- aOjcucJdwzcZQ2eT5PBsU7P0o1xlCgCMqPDWczEWY28 -7B"t G6B?`-ra^Jlcl5g[9M#Fj&Mn]Sevo޹}_n5;ܺ/1|cLCf!=*At{ \ No newline at end of file +-> ssh-ed25519 FAIX7A pl4zTRrmyNifdO8b8doSjet5gSoFpONfiguMwVpOHCU +7Xh//uKMTAommAVmmr4umaKT+sc1UMpyN0x5nktXd74 +-> ssh-ed25519 j67FXQ wpxRi34I+bFkP+bkOPsBRpoZXem7EBU0qEEoI7reiFw +8q54R8NNM4pOybQdijpKgukvzNSKgkHMkmyvkC40aCU +-> ssh-ed25519 wbGjmA 9W9Zd6IiHTAyDmtdFHICgHNBNmSv69dWIQ5PWrBmbFc +ypSUUmdRztDAFFMHr9KHPPZhtk9wT+nOI6fU3f/r95A +-> ssh-ed25519 B9K/XQ z9MyCdvCDmEpoQ6VAc4UL5ykKT2y7dTWkd8uC0TCqWY +dI48qpfve02o34ThBSuXpR+k/ZS0JdcWWS0lHZEy5Xk +-> ssh-ed25519 vf+WVg Is1UbqPX+Wg/Z+ofr6pltx1Hd/YU7r0Cw43vYN7U834 +BpsNPysnx0kDPvZNx5kiHBqowGxc/ixcxLbVrEEVNEQ +-> ssh-ed25519 H162lQ fLD0bnsOAT8YAwRwScQmDY74CCiKz5o502ENBs3HyCk +4BOHx7fsMEIrKUt1wQ/wZwthMQMtJLcLRt5zrNY7pOI +-> ssh-ed25519 b6YMqg 87GJmhVV49B3lI74QT4GszBMWIoADwZ6Tr+gn7ai9gk +oHvVeEduJ0WBl0WmXAKgn6qmC8GRZ3uKQHwaEehKemI +-> ssh-ed25519 Lqn0Yw 14WT2Odd9MqCJRmFnXYMT+78J5tPAoE3ZN50eY8o3wY +4RZjgE0MG7DkGBa7msq4cq3sSBQp+AMzghAvMWpEpds +-> X25519 UWwTiaziKhTE4iW3IPYg3eVtgRp+bnyWxrcW3k66VmA +Qb0Sj+t22AqS0lgx7uaiDgOn7KMxnDvUKRczTQB9TG0 +-> N6|5#-grease + +--- SBETWPCFXoHLlWtd8R+ZSoFVqaE1RThAP1QwkU+f9a4 +d++xN a"^w.̕#4=ҳN-J=- \ No newline at end of file diff --git a/secrets/vaultwarden.env.age b/secrets/vaultwarden.env.age index b60971d..f96a001 100644 --- a/secrets/vaultwarden.env.age +++ b/secrets/vaultwarden.env.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 Lqn0Yw r7XhdzWjjBP5HLeX+RwIek+vTZP1wZhhO5sr0LppdwI -4HH91EuAKYOQ5E37/dH7fgFKShxE1aX7v/njbL4cNMU --> X25519 itbc3rl6K9BmbhNsMo/FaeOynrtrpZj5Zt0VF3McYmw -Cc0jPYLqyp5X4+KPfpy821mpCVSDke+z+Al/8Hp7vc0 --> WQA%nPY-grease n&Oc2@ sf 05 -aC3qV0yeKogkc/OdfKhxW2rv4GDlT4mMlPA5FoqMA/2lq6yCoeMjGffwzXVEsauq -IRyYz3R/53ZrFtfefkBS5P4d4d/OmI6lsA ---- KYxAUYn/NHyfCJO+WqH0JKJKQZMCQYSeMryS/Kw3n8s -;i7K,T&{1^]WVzLKs Y\|@z`b'-lkP'aT''mZk76iK*-t 1:mUIqNчމst)# \ No newline at end of file +-> ssh-ed25519 Lqn0Yw 6M1t8mb0iZdJSPiz8Nu0nRywlpArnvcxizdxr6u6yGM +w1PzOCZszgyc8vF5GJPI5l8RtQwFv0CNhpAxJAF6TOw +-> X25519 +M017bsZwXazaojl9szfKRagMK1lzc+gpbaqKNhRuFU +fx3Y7OykdZXK1g9ixdhExhAmLqoVrWlNUqvkMPYtc0Q +-> Lv3@gmCc-grease v5T@. +BUBGyMXy +--- PoRgQ9bY+fxY2gJXHUQbEGW/bqa7KwonajSG+ccr6Mo + IR0? >A؆l.E$C^!fgۆ3d;i;y[;jݯ0Wl:q sFiɜMt-1+q \ No newline at end of file