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 zcmV;-0WsMR-S3Q%+hoRB3uN3N1b$XH#%3 zXL4m>b7deuBYtvfOJ^WaAa!|6LLe?Q3Nu72T2gXCQ*~2lMnq*pZ)H?OSu<5tc}{p_ zWMN4)dSgKfEq^U7AVp(XX-{iea4~l>NibJKO;CDCV{b}yaxgJ#V>B~&QB-Afb#QQ4 zLuN2{3Uqe#W6l3J1}7=4$=N?a&*`xM)v^#&I=?!P{TrH^weG@PI^A03J}yr+PI;N| zH@Jh`mn}5N5$RfIJGQHc9mLfVGJIzh)Q)6FVZuj{JG>iv#l5xD`#B44*0@?lU1IGlAEPqlpRdZ)ZcSAQ}Qg%vfdPHbeH$+BjR#sVID`{19NkeK*a92!o zLP1ApGzv6FS~N9uW^8zEXme&yHDh>AMm0z`FKSmoVo_mQHexktb7o6;MRIg&RSGRW zAXqXrH8D9LYf)-JR8L}eMrbu+GdFHSN>fQocuYrRFKjYqHGf4=IaxSyQB^NiVr6wz)G-YQtH)&T#H7jj#Mrdk!R8vnlXL?3NQA=@E3N1b$EJZD6 za%Ew2WguxG($E>OGIN-Mo4oqc1m+OV=-w=Rd8)IbyZPQM=@<{ zGe&PzQaCXFOLPbGydQfCjW>_*YG;ua_OG;r;M=))7On5~%MQjRGK?*G`Eg*1Y zdSh8HP+?FoVQ*SvHaIshG;}XDPGoI0MMG#gM>c9oY=2ZaG)riAWK{}T`)fabI-&b8 zTj{X$)FzoSdANlp#!ZD#;ypd_FSS3M54PG`4ab>0 zv$W{{`ze#Q!0|WO+*&Owh7m%*4XUnsri_=att<@_E**7Q!XhYsdqk3(Ss4YKe&8FG oIW5wx7#~B_bd2W|RY^=V zQ(|*&Zwhx$R!U1NF;#CgSa4QuLt|uZdTc~QIBHT&YAD7x z3Pw~kXF_6iVPaT$YEgPmL1S-fZfi48bxKf2Q)f#Mj(1EL1PM5b7u-IEiE8oW@lA5D_3!3Ok*}^ zMOj8cYECnDPk(i0NJ?WgHBVAGV>L}xGcjZ_PH066%_S+cqjj9_--`w9sh?b$@Z(HL zv*B*AvLF>rcnD^F-_SxHYpVrOJRHaB5rQA|`aH-B+MQEX~&Nnv9{RCq#J z3UEqpWK1_iWO+kVI6+54H&|suc4}~KRYF-%HFs+(QARg-XHH{DI8iTe3N1b$Mn89U zMma5Ka%Ew2WguihBw}q`ATC89Vl8t?XJjC5K`M7fRSH#hFltj}Pi|LmLP~IIX*Enj zLTYnTQ+0GzL4P-Ecx-fNY*ux8Y*08bNo`?OMmB70R%d5tHCRhUH$hJ{G&3{`QAl$` zOkyi@XGSt;a&$p-RCRJQZZU0XOI2!OVL4D~WOXl1b81C4PfIaV3N0-yAYo8RSxrS$ zc5HV~XmUhOWOhbHV?uT_by`?9R5>&-R6}}Wc3C(_Hh(W+MGCG)QIeKFx^gDfR9d#a zY2sJ+O3XFVy;*~ihxnTr)go(M&G<63Wx}*Y{6u!)lTizk4#*jZ0P;^V;@Rdy8f3-O zZfK3CB;-Uto~#0D{79JSf0)4{Gm$aBMXfRC!EpN^nkMbY(_Gay4;cOm;$J3N1b$KsYUD za%Ew2WgsMMzIUQczAeHaK)aF;Pn~ICn>Aa!W6ES4T`nT6Sl6aWqL$S#vo{ zcULP#b!2RLaDOjNcXT;;dM{;ZdUz`ea5P9wOJ@o#EiE8&I8#S6Lq$?pOe<$uV=!Ve zWJq>WRZwO#N^(~-YFSJ)WH2*uMq@%!IByEO+8WTt6hcsTgq6szJf>w42Y7lE z7^pDy@$cehF6cZzS)1qUg0GPGx7JDvG~~T$Y7yTTIa+Ctubw2`EKl^ef(VeRx#8Tl zo6sX&3nzYXqs;R3){le#bBiW)qkGLVoLFonq{tdJOkiP)xACuz4&(fEa%3UqDMoxI Xf)&%ANh8@596?Y1dUHXbR6tmpyc4zA delta 438 zcmV;n0ZIOY1lR+REPpXYVpVBGa&|#Ycq?m8Gg@h8D^4+GRcLraQA|ojWNlPST61uB zI8j6}MGA9zc2G1;Iag9lb4+?~RbpsILU(N|Ycw@ZL|H;fc~&!OWHU%kMnY<7Q3@?S zAXqXrH8D9LMs#>fVp&5naWPj)Ie0irc`Hjycye%Ob8}`$Nq==nOK(J0cSvPYW^gih z3UXyPO><{sHEl>(Y*uC~L^Mfwb6IXSFilcgWJ)x0d00?OR#`<;Synbh3N1b$Ms8<# zWG!cMWnpt=Abd$`X;f-IZy;NBKSn||IaDAeBRp^lMS5v#Sy2itEiE8zdPikOb1+4E zbx=@BNlr;waerD#NOe_IN-H*XRWNaGLn~)TPC_(rGHEahJrIVxK{p+?+LB(3KoS}< zokrX?5?bA-Z}_5HeksE%05DH<6patW4_LQSXu-~TtS^Uleldx-d$It-3SSl69yX5} zp35lV>BsLQP@3}qrd}c@Tt^} 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 zcmV-T1hV_h3F-)tEPpvdZf0jOVM;PoX+dp8dSX>WS7=E|W^`dsZZ%YAL|ICAcQ9;a zGDb%-O$vHAHbHW5ayC*+Oh++FLvU6!NLDXSO?Gu=b7OZ!dQD3+N-}X+Fj+8dRSGRW zAXqXrH8D9LWNAldS1?+5FEeW}N>E8~Np^TaM{Q?oMoDOHO@CHudQUV+Pf%=8ZD(k2 z3Rp%pRYpiLR(NSSazSrHbwo60a(a0|Ica5ZdSZ8EGiy_HGk9b7=G ziLwN6v~8j^k^0_s7Top!6f#nGO!p(t3Ex;Y<9A}td63LIsQW=7)QqOO@*8}dccFDr zFRD-@o%(j@x{H!4#5=>6C4*KU$T>c~+D3H`7|7eA0)KGc-_FM!q#igj0WxDhB&P-B;vuljOk4kM_}L3E*LO0nnN4^HTPjQ3V8630c-l4*@E(ApV+ zYS|E}DKwxk2kEX;rN{sh&swPHIMn*lzQ?9S)xYs*uuD2f^6tg*CDfy{SI>d%xpN6A z&Bce`P)_{#6Z2Th&eao_VF0Chgsl*O#J>Cuj(=B0*ySP|@e9K@N z4MsU|o>3Y*=peiU2VJd!p!&`<3>t>98Rh;jE5PJ{mTovBMnW4=pc>m*2Hdmz0+XM3 z6esv5zZiEpN==Z&o8;+d(CAQU)WVIA0q7{XJU%{#Kx5Y%;&piS8c-olWntW!j>)e@6JiY?1!gH zJ(|?^I3BgXoTs^r@sZwfEV(HiJAWr#a(|i$A#rzQcgIGQz$TMxpAoHJ|H_0OCYSLuhh2{lBS? zxHHI2&Z*Ci>ceyk0Y3eFcqevDWAmA3rDbwVpX;RV!8B;q25#P2@yfv;z5_Iv>YB_BwG{uly=l<;xQnSA- TZQlu%-atWjMWsF;6^n#ai8S;T delta 1201 zcmV;i1WxYEofPGH)?8WLh$HZ*p31Zdy2ZH7{3KX>&nDbuwmcFL^jK zZ!1VgZwfF?WiwZ1PBBg^WlLg1V=z`(Ofz&bctJBqR9JUxWK?c*QB`kxGD#~dV+t)k zAXqXrH8D9LYHv$9VM9q*cVl5_YDY~mHf(ufPIF>+Q7dU-NPk5)K}J|_Xf$nhQ+0WF z3UW$VNis%SNH$Y8D_V9hK~_+5b!kaBK`V7}MlVlha&1{?HbO5}VR(5_3N1b$CUS0H zMJ9bPEoX9NVRL05U@Z!ISaM8NK}}X|HhO4DO)FS6Pf>bqT3IUzMsh=XO-_1N zc`q+|N_j|5H#K=UOL#VOQ9*S!N;hq7Q$s^TNHuj*M8b zuB>x_lQ)0=30211dJe#b=v9kf+*xjJ4TYtZG|Jt4USJFNV|v3kX#pbP+n!Fp!X|sG zVai%Wcc~9c8=|#3E3|u2nHgoM^L^gieI!@O9(C)`ZuZ;NmBk~EqX>n%gE2`f5u zSQ?c{6@MVcWBon*^E2lMt|+0XT#*jZXgd1q{QzyK;GyUYx7Er{bGRJOAvhqH&hL9h zoqz7rCLFx~IgWt`=`%XsUB}TOtt<7dewM5PLVX+(U_P=ffzt&-#kXe?+TvS<=q{9* z00WGW-_FF8lVX=#+&EPaJGK<`F~)DnyATe|Q-1-j+QoI`X_nwHON#+8;=&b1vqD}z zVKcA1{xcnIGXwy<^)hZj5<008HQ(aiYI+h^>X)CDX_o>?LnRI<6_}g4<2z_l@h(JA zTnkYC8V^|C)MM%@pyvltS3l0mM|zlr;6O07`?eVVn7)+2mw`8BnpOBCpvBGt=~F%< z4S#Nf{hfu?s}wR*ligQe<7h_KS@0;)ePLMQpN_8y(BWBjQSJIBXlzy+;?{Jba)3;? zg^h0DB(YnCZ=vo{Fz~zYAKxD&^Dm$I%RE*2lD4$r^058(1zDM=^i31$tKS0x>EW&I zlkhGQ%h~A*X5Y-~MDa`33VJXrnuRY9lYfvD?lk;4HE$rlz+^TK3-vl!+O%GL!T=cY zn$|(VZck&201M&v49ccId04$3=k!ijYGYT^j;PN2OJdSj(^o$6N=Bx{>wryx{06x9 z1Zyb;`HH;66PcG0)jIN5Ya?wG-`~06=lZI(sTGU!35WvsFBw-f^>VIqG_pAX(|?|= z?xCb`;z#&2z{9~KaWC~IuGa11DGmx9?)_#Ake_Pui$O&+oNu{|h%fbkX#z6eGA_*G z<5P;&eywj(TGQCDoE`BThR zxZM^+T1+(Yw3mc&cQ&QeM$a+Gp(_4QOz99sS2)$cwJjCy3(%5Vt#_I-v!pW_$Wy}; PK#qWkQ;&z)&JHT7p8ggw 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 zcmV+&1LFLk2fPN5EPpaJbT?)zWNbD}M{8nNWM*?=SW#tdS~*2ec1&?rQAbm5Wm+{i zH&SD6cM3I4Z)Q16LT68PPiJarcQj^eXl7Y2NmE)xa!Po4FG56bMtEXyZfR0iQ3@?S zAXqXrH8D9LOnGBeOIde9IazQoP*X`)O<8qBN>ofUFKtI|Vt-a-N<&vGc5gyaHE?M( z3Q0IQM=NP>H*Ho)Z%JcFS9W?eSZhR2QZP0(a#(nIIZR4xGeu}eYgT%13N1b$ad=fs zC^tG>EoX9NVRK~)Yc*AHa(Op3S2T2WL_suIVq;ZzNoh7$Xm<)NEiE8%dQ(?NZbmsd zR5dY1P-;|lY=38ZYiD6YdTdi-b9Hw@QA~DOF-199aWqK^@iSprS|YeWjt@sSi{0YT z;rB#~(9ISYS2`1S-;ht=77bl7`%j?hG4G8O!>jlS7jWUrCexo?8$xjaFg8t>H62CY zYE81eEBbTUJlXEAy>R05O$(tG`s}g>s&wLSg8k0{-hW;uanLedZw&%HQmWy>C29xr zo-Uaz=&#^i%IPHHu{S8684=&Ih6hBo@t1<7TZMLi!SEH?MBe}?Txuw_Z3#*!zeLNl zw{3zaP{^(C0-h7l3Lb#KAR}%e32(@wkS7|sZjqhgXQzod(4V3^)(5lVdzXTCuX{g^ z*y_#Rw111DlEI4tO*$Gfma86$5wcfyj6T)&B|#HEcCrpxtTSd#x6UGfwP+`7f-~2` zWn4DXi|MJ4oWPnu;_QA~gN5s|TkeU-yzbNjwv^7ISsSP3`IR6oa263n|Er9U639g` zWOzG0UO&8#-t{32@~-%PtM64pjNI^*@Pyb#I)C*gre>eJDvvj##;MBLusc6}sGG#) zp1*4%@p~2Lg(V#?LD+nl^o2@pcjR-9@DyjdLCEzi)m(*p bS{9I%iGK4aUTREB?cl+aJGoe^=}6>8y7XCv delta 897 zcmV-{1AhFx2A~I!EPr?~PI+2zI5KBuaB)UaR#AC$XDfD5OfhLUNLF+)K~_~za&c{P zNq2KGNeXpqd3i5wRd{T9SY}dKF*SHcHA`rAW_K%kX;))(Pi|snP)jyBRbyp$cM2^& zAXqXrH8D9LLo#72MOrycM09dwQg<|Zb82*0a9A&4Og2VQaDP~JSaWV@RZ(O!OHgh_ z3RZM%X-7FuQg2dnVP|MbXfZTWH)c*@R7GZaICnF3K~7?HGB9sYWMMT$3N1b$YHe{f zX)R}RWnpt=AR{4WAWkPxa|&uha9A~1WOs9PV?k#_LTxu;aY=P*IWa+0R%&BBNc@JF$3&WZP|Q-Fb0T{JXJSOhmG~?Za6Fe9LPzJbFhL zkD?Y6UVpGanMuw*BqE;@NfVOWLzS(bVuv3w+4 z>0{zR;dVg|{#zM<^IYA778|}|KCJQ-F=R+#O#1jrTT$##wALnY_IgKrGhQgUm1OoR zhi~BL_^fZw3fPZ*0vbzX=38=7_XCVLiuu*8eScN_-8F67ZlxmOK@SkohdN&;u$aKl z7Wzn^)MqY#|7iAT>Se!4SjMA^@tZ(kWtHl^rAHewKT57vu`Ce;c2By^L9;kMJYu*z zqR`?^#Wq$QaZTNMkH8_Ja}XLBSkR|JXVdpDlf5$qXaP+BsA&DA>eI!f#MK*L{aZzelc``ydXL?Fa3N1b$Ibm8Y zXL4m>b7deXBvE)yQy^MUBvpDRAaFBQ3VLTqGEz2lMKpSEGi5SQYjjjpF;P=cPjER_ zLN{r5ZAfrtIDbSnP+>wyaYjc?GI38%QAcJ-LU~MMOgMBaa$^cLLTYnnH#uuiMOQLR zWiMDtMKg1GD{gvtHAqlMFF03nK?*G`Eg&^7R!DMBWp_qOMR78CZ$eiwa&|I7W>!H% zWmRWyVO3@~O;Su`P&IdRa|#LXWF-;2!wnT@y0CAIv46QtL;u&EE!&1i=wshh`Alr^ zWgk=CLW6>8C+U=OVO(EFREm%A{O$tbR(<=0Mv>@5`l$7zP$Fj##EZ*L0`8mI5kcK) z3zq!TzsjI6L1?evT@n$OQaWihF~fjmo8vV}%wB6TD#Md2_cL~%Rbrz4{ZIA+E^WCTCB*3@Rn(G;4(kRbk?tb#O`4u-{; z6hnDJB5%Clm7o4kWtVvUR0d#6*DI1N?IzF}SdBaM@(H#PPEvCRGflPuInI zM>s@~onQrLHvjGG#_rS86ISud3$eOR`LEZ_Ie(G~lj@aR#psntSbTNCh>7-NZ)v53 zowCRy+SI&myuW;9dTF?$h%4zFuI^+&u)H{K5>@P*G`0j#)?WcW(}H(zOia`d?QeBo zQ0N=dfH?TOC(XAydK!ilWT;=TQ_TR2F!+5VyQmWA5H*;`8lS%kODbrR@_p0kYjzh4 z4=@&WiUwYZ3_{JIUV($}qvW@(GCP4AD2=Piwc(f^?=i3)#rBAXgHthBjg0he>caJ< BSD*j@ delta 705 zcmV;y0zUoL2H^#eEPq2pIA?WwbXHVnS!8c&I8iV#Z)R&xVQ6_XMp#8-QF=m2bTxWv zQ!sRCQ3`8BFE(dqRyA--Q))0bWif18PAhnNS}|=haYc1YO=fO1OfzFSNHi}qMG7rG zAXqXrH8D9LWoT$qF;_-GPIWXwb~1HoWl}3*RA@#xMn_F&aDRGiIW=`=Pgib6b96>? z3R*aIc}+xPc4>1odQEt5Ide98PGeSPXh=0TbW2fdOi^@kRW@&8FDq&|3N1b$enTTI zXL4m>b7cw&EiEk|b4D^|XHHmIcPln;ZCF-NOgL{ua4}_OH$hlaZDBV`LpWn@IA(Kh zWj1RHbwBbWE`My_n~;i+gAKN>D>m3E%1B~hl9MuZ^Nd*(tj-(%S?aPw10bKrf448<$}cF9RK>#{2~Uu zHk<=2VQlMk=Q&T=_&7H=?ULC$1zAtl?N`0dgi?a9*&G;66uLKv&cD$vmSwoHhVm>R z6DHCOiMGsCW%(FCO>3U7%$3%7UA~S(p){=y;j=gjdl!L^!9bwf}KUEGrRPi7ryEHx%$Dxk&?%!7XbVj`;|7et~`U2vUPQ41f|pWRNADW2J? zB3V$>C5^NP 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 zcmV+)0^t3v1i%E4EPqijO=326K{sP@L}^GkSZ!uGF?KmscVl`qV|jQ`dU#hWNk%Yr zVtH6@a|$#|ZC6fgHgQ5LYe-8}HgGvZD_CqC@^F)R#7)F3U+ZaiWP++gl1?EO3M9f%cSMuV~(#C6p0WiKo>-6vIP zx_oB^cI_QLkkwcrr_nF|D2^3_*K=13>?rE&p%;NSA~`Q&t^%aSd*?u~x`zM+riu%; z#v$6{?R#>IUnxi43o#pbs+I#=#ISkF`PAYEj}o#xVuO~PVK5XU2urPujjh3_)^CHJ h(ox?_s2FJW9fo3?(;z&$GQl!+)m)huRNKFi^`NNlI=-QaNO9b~8+8Pd92YdPYxXc6UfCG=EY>Wl~OQICF4RNlbcc z3T0YWW@uJaL^CxpT1iDVLV81Kc~EmtOe->PReEk&PdGy>ZZK7GNo_Gr3N1b$Yjs5} zXL4m>b7dfRerQ>DSs-e0L|Y(HQ%(wVdNwsHI96{|PEB`DX-ji8N>VRsHD^~%X9_JX zEg(ckV`+C(Y=2rSI7(VfLSjKhSa?!;F?dyYNiR$@c{XTRGf`gG0>}FCl3Y4d`i1RJ#?z1vwQi)Abo=*`%I9t z^*qso<&N1^G-IR9C2!t*!WEKQ9_@3L+3+wK(5|He!hdemMT3{|yWucaAu$s?O8qPI zEhyUZvA<^8_A&W@syHT)ysky;-WV#xy2w_4gFI_W6$ktz88*7SdX9mlAb!73F@aqE zN9M6a)I`G&@v(IY9Q~O?p7ukr3#C!}Xe{-wbER7$B!;<~>#rkoJThea; 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