From 7ef8033b53e4f73e3543be94ff3bac2f0c68a5d6 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 30 May 2023 22:21:12 +1000 Subject: [PATCH] update secrets for new helix --- secrets/borg-key.age | Bin 1012 -> 1039 bytes secrets/borg-password.age | Bin 804 -> 749 bytes secrets/freshrss-dbpass.age | 16 +++++++++------- secrets/gitea-dbpass.age | 15 ++++++++------- secrets/secrets.nix | 19 +++++++++++-------- secrets/woodpecker-agent-secret.age | Bin 527 -> 565 bytes secrets/woodpecker-server-secrets.age | Bin 437 -> 544 bytes 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/secrets/borg-key.age b/secrets/borg-key.age index df2e71e1464fa6bf989faeadb0f81274bc93b06f..5848be892c97557689780ce3364e2ec30c73609a 100644 GIT binary patch delta 971 zcmV;+12p{f2agDlEPq8pPh><`MrlPaLq~8jNO*EFXiiXMG*L%XSU50vZgw$QOH+4i zP;_ByZwh5*MnqU@b5v7qYEd^yb$4)bS9)?qR&HcdeAQ#DX?Gzu*~ zAaiqQEoEdfH8n9gAWJfKMlVqySVc``byPKSQ%-I{Omt*!H%3r0T2wJYWo>C%QAJjI zR54~Xc`sUQMmShS3TIMiL}fQ-Vn$LnaZxKuT4rrUT5L8edUJGBXDdZBZe>PQH9GFKKN|WGi=*UjY|?LS}C? zS4J^*Nk&O@Q$bmEY)&z1V`(^KX;)fjNjOp~cra^3aa2i7b1_8b7de&TyZcx zA#@-xTx3CPM{Xb`M>Yy(ZDC4(D^GY*SV~V>GebgGSy5w9a&tvOc2hDjNm@r?Nm(;k zQZGeMOgU3mZd6ZKZ&`O!Niu6yT6QupN_Pq^EiE8;cywzxSXwb>FJf0SIdocdQ!`jc zaBnX-IC6M#D^zMPNiT3YMq_hQWjG35FP>n+MGj_E`K~tA&GA70fI~)qWl=86hVF~W zH|}VLAtN#At9!SzDy8J{Oz;04o#^V+${KId4=4sURXy&sOPo3nWsVyA=Q5RAT2xz5dg|1^na zx!B{!J-=f+Tw*ssf^dI5C(lu!MYjYguOOyA%6W#tQQ+opxn30-X+`^y81# tHVr!wt{P{YfGt2C_XJpM@z&&#wS;eJGil*&Dhd2o2IsWX^eK0LhDZmYfr$VB delta 944 zcmV;h15f;q2=oV#EPqxrQhHA_XDd%NJDsTQAkf|Y)oQOa%n?CD{@9fb#O~-F=K9bPeyEHX9_Jo zAaiqQEoEdfH8n9gAWJfKMlVqyc{Mn4R&;4kD^6ojQguy7Rz@;WHd#<%aAiY!O=(GI zT1I+mb5L|waWGgo3VBIOQEhrTb45jXZZ>*3R#I7TO<8nTb~#E>M=~)qQAb5pbyHe) zG-NncW5$aPH0JQXH_*zXfUjY|?YEm+3 zXGL>mT107AYg0*AId)1{cULxPP+3P=S9f_fRY6cIaC&!WbwO(iGjlIxV@ORhP<2vc zdO~buZZS8b9ilaV{~poM`?EoxpkWD zG-oLi)o~y(zMMdO_c!tDhnX>751@Fj1fA0c=9xdr0W>N>Xv|1w3z`Lg`5_MR>Q!w3 zpb=Dp5o8Un9dBF1wPqJ{RNMY!`72O;7l8DP+j_`p4erFY8qNX&yN7|jH11N|<=S9tJTNi4|A zJ#dbrl}se06)MmDqMp&d7EuH&Ylfe&cY8hGH58Az*V#Dpk6pJBxda0=!0b(A9(D!8!puWG^>jZSu8EcH6?Et&P zLfszo-1}2y5@Y)!GiYZOCyQjqvkKJ}GP#KSs1af!tv|>qdr2EJ|H|Kp}nn%;7$h6I)Y1$-h)1*y7 zhu~oc4>}bU4oUv3pdG~Y|t zd{w1#)sB{>d9A9W=?+rXOe|6KO;v*Mku)R~pyhJfPy%_Gqj+dHM{vb;`BqZMc08{n zHt1egi-=lQwHzS47;;@Btf?@9Kxilr`}q%{h38a0LhN|kzYUykcm4@}BkBDX8@y)45;eW=xI%CL!*dh{TYN1dDBk5w$D z$#Int$50a4Zv+@q;yhz4jm)tZ6GUCZGmaJD8Nrd_fF29@LQ%4-_(ZYCwx#U3n<=3vTR#PWAgt?b9}hj*Xphovd@E; zmy)4)P(N#&z5vj69xfE%VxBE8XUUpo2s%#t6ytRr-k@V~XPAgp>P#&<7$k{NfI%ue zK>JmTa4;B!A%_J}M=1DQz+e~<4u?Z_LBk}X;Rz0ur)wqx`LzU^$x&4^?jlUCts3Ks zfx=OUa)9~u+iZ$Z=!uxCxz2|<|nn^Ufhs_T=3+d_)(YH6BTz?i_I&x=n z_0gxNKYzWIU!MDWNK9Ng+I_RyeE#lXZe#2B@e_+;Velse8ry39#ntA6wa=$EH?|JU owW;lul`m7%GanZ&omsv6^*zYOsQvwY#_Y+11$E)AD_tXDF6Tf literal 804 zcmZ9_O{mj$008itN^sy|hs}41!h^Ap{hOp|TEULAN!m2&XPSQGAm*z{nzT*wPueDr z$527uLEO>9JUBLl!3G}2^svDWJM1K)7abyakmo$iiR`*LukZeYpYGVWy)@%2OuW_d zvsLVXHG$w&6harbEs~~*3fe5C>tY|JbZ9x1Q5MR*H1tW06Ll&8}K zkW;Yy8xI*pzSTWT)#`dwSj__?X`Lpz@rWp1SBBrka4(M=-P0_dY$lkw8A zXD1C-?-(K#MG>XxTrbm<+!FhCCVO@bMjoZINWZuB>)WCZx@?ZIMy*Y`0sJ4D%0Ozh zh&sopQoaFc0Mw(~GMUI_2c3f;2HJ24${nxcZ8CMVXk^(cas{W-D=c&?aRj{utc+k0 zM%Ohu7>D(!I1{)*;)ztg)yoPP7s$5T>RQdvb-FbpO$tXh->JtEi*9R%OpjQ8Jn2^i zX2hhWnd-rpiH=WYtj&2|MR z>uw(_K-1>B;V;*MG}9d(XsAF8_7#fPD7#h5xR7`TH;bp8fXNjel-` zKi|KfJgU<1nd|;fCmx@_^+NjY#}7~5`T6DH5C%uUwuzynB;*@WID_j@hSsciwPU*@NG{z^f-uKd=7q={+MjxAXS8d+-j( CwHWLG diff --git a/secrets/freshrss-dbpass.age b/secrets/freshrss-dbpass.age index 123814d5..c88234df 100644 --- a/secrets/freshrss-dbpass.age +++ b/secrets/freshrss-dbpass.age @@ -1,8 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 kgCrKA wILVHjLHNY2lAAWw6ENwYlRTRq6fWAO4ZHxd/BXDvg0 -DCIIBq++JSKzcFOJ51i0USitDOhK9R6NEsCilGlxKtA --> e-grease F -cN5lygYFvScErf/J4BAEJ5ZkimpxOUj9gj8jGZV6Cl/RMkUThxflOfxz/OOBOK3V -S/NBseDL2dg9XzIUY7k ---- IIXSaSol3agW8SNwdOqxoV8dTkwW1CWxgJ8R3Blr1Sw -SӰyQ>lV,yR5SgHPj`dK6پ"uz)L[W˄ʷK \ No newline at end of file +-> ssh-ed25519 6DaCrw 1dgmzBJiOecaCLSJz1nrw3iTF9G00gIQd5hY6HXZKUI +HVkZRyHiKJ2E/Wdgty/uMbPm6lNy9wgaGwe5EJcJ8jY +-> ssh-ed25519 kgCrKA aQiYpgMLe9uSw7NB89mt3Gpa29RqZGHfnZzsOV8DaiM +gcgFyaibNSL5/7ITddnryWFxOuCX22mtGY2e0uL8MEs +-> zWZg=\-grease GP#:NZ \CW2nnR/ /k +bMvg21MLLhnwNVSyNMvMZNT9MzyiT6UqLn3SJcxGtt3Eu9jcMAphAeGy7i+8pQbt +9MnCFZBN4JG+ZunMtSQWodmOqiHFV1vKGsjqQboMsjMo +--- glgRELYTsrSXv/SK/6RDso2FhnvfCT1TB3Ytz/AERPs +97l b,!.L_MC[QrZk s"Q+C$ثϫ͎"sR[ \ No newline at end of file diff --git a/secrets/gitea-dbpass.age b/secrets/gitea-dbpass.age index 28965819..aa77b0d8 100644 --- a/secrets/gitea-dbpass.age +++ b/secrets/gitea-dbpass.age @@ -1,8 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 kgCrKA /u5qYf6vYBVeJryLq2xvZHXk9LY2A8+ks/XV4C/fixw -HNLXInIHa2d/CZR8/OwwhfLurpEbxiXca8Ip3kp/EWg --> s9b#/i%D-grease -DtUrN1QNHQyj0mSiV9nAOBpjf1/3yxxV4E4Xxr0oR2kJa/VWvpIYzyReZdRpS5Xs -Qf0Rw1HB9OAMAQ04DuR6FVfGYaGm ---- WszM9cCBr4HW0I+HltsdXj/BCxUDMld4yAVzXVo1HLg -4EݾGT/CBrXYWfr|e5}P) \ No newline at end of file +-> ssh-ed25519 kgCrKA QpRQkobE13NxRH81V9tFP+HelBBp5KE2cTyOZIyKsVM +hw3pwAfiQeVRqNwITHCKx8u2/aBtwdB24FJdexUfMyc +-> ssh-ed25519 6DaCrw HjJO4lhmCmsRSD979Jva6UXIMCYqTzmkh7BX+GkbpiI +8SyOm3HR23KfA4pz/fL8dwbvpyXQJRE9ymLMs1lFCBs +-> P32-grease %>7>/d}- +mB3N3P/0E4+1zo1l/cqSmqNqGBaDw2RrH4RC11GfZEmadA +--- 2P5bd82ou+ey3DbL5QHZKQM13N4hqvmzS5D9eWkYw5o + f2GqӍ;f&aYG BB*Vzl \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 8180a160..5160f6b0 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,6 +5,7 @@ let mossnet = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA0bsVbdQR6iWNLKIiID57A1+dVXC58Dtf5cSXg6/JF root@box"; lituus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2lAb33LH3JNuOfBXt971u0tHe+NURFecQdfjwEj+C+ root@lituus"; helix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAKrL6IDHNnHmxi0q9nzu87NOyidPm3HpE7klU368lEf root@helix"; + helix2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2G81z1E51ioJQGLHnTJEjgSdBqLM6mb72Z+0atE6Bf root@helix"; curve = [ system user ]; allUserKeys = [ system user mossnet ]; systemOnly = [ system mossnet lituus helix ]; @@ -14,21 +15,23 @@ in "fastmail.age".publicKeys = allUserKeys; "mossnet.age".publicKeys = allUserKeys; "curve-wg.age".publicKeys = curve; - "box-wg.age".publicKeys = [ mossnet ]; - "wallabag-password.age".publicKeys = [ mossnet ]; - "wallabag-secret.age".publicKeys = [ mossnet ]; "nullhex-smtp.age".publicKeys = systemOnly; - "borg-password.age".publicKeys = systemOnly; "borg-key.age".publicKeys = systemOnly; - "freshrss-dbpass.age".publicKeys = [ helix ]; + + "helix-wg.age".publicKeys = [ helix2 helix ]; + "freshrss-dbpass.age".publicKeys = [ helix2 helix ]; + "woodpecker-server-secrets.age".publicKeys = [ helix2 helix ]; + "gitea-dbpass.age".publicKeys = [ helix helix2 ]; + "synapse-config.age".publicKeys = [ lituus ]; "synapse-database-password.age".publicKeys = [ lituus ]; "sealight-mod-password.age".publicKeys = [ lituus ]; "telegram-matrix-env.age".publicKeys = [ lituus ]; "wallabag.age".publicKeys = [ mossnet ]; - "woodpecker-agent-secret.age".publicKeys = [ mossnet helix ]; - "woodpecker-server-secrets.age".publicKeys = [ helix ]; - "gitea-dbpass.age".publicKeys = [ helix ]; + "woodpecker-agent-secret.age".publicKeys = [ mossnet helix helix2 ]; + "box-wg.age".publicKeys = [ mossnet ]; + "wallabag-password.age".publicKeys = [ mossnet ]; + "wallabag-secret.age".publicKeys = [ mossnet ]; } diff --git a/secrets/woodpecker-agent-secret.age b/secrets/woodpecker-agent-secret.age index bce3ac9a58390af83d0e2c09642757b14fb0539a..6d9b96110984af9a360b0118c617082dd6dd7621 100644 GIT binary patch literal 565 zcmZY4J&V&|007|OwhRsqf+$!J5v{RJ(xffOX+E1am-do2ebWd+(!Tj<+9XZdG-2!4vT?9cq9duAv{RIz?=|B_)!#I!TUKm^rW2cm22)bQJ z5*LLdoFuV&LBdm^q!eJoWUQiBguN>7j;diSuF{276G18qyX9sW+4DT%^sx~*h#(V5 zgtye1g3mH@0yr#UvM4vYB7;YS3e-uPCKfZ695(;ee20xCx?tyck92n`>O_#(q@QNK z>(69oIp@Ra>+B>%xqPpgbs{EZDI9B6CBTqv@VB=Rd+!mO&c&H zOaEyUXR`6K;K;I?4YEA&{4U29C3YZK?Pa6ik|RNLTy2@Il)wi=b~;1=H8yIDm-l&2 zqeqljwt%NKT62COM=*DtIMC+}`_CS){Jkylo9h&HVrV8184)JlZR%Dxig}F3e2p4l zJr;EAy0T(m8hXQamsnsDV=Q=IVQI(fTNT&N?4pmLC|XccOr)KR5mLjZ%^ii!ooc(3 zOcHxUwB|Npu-!5k4s;eI$SLjH-r=+S-Ba=8!NY@VuaECu{_=hO`RzyQ+=hE&Ub%ku z=sEc~J+m#n`1N4!uaBO5eShKj)9Jm#`&-%1JNxdB^P7u0`r*}y&Fy>mqnDSqcCCF? Hzjfm`sLsf) delta 493 zcmWm7OKZ~r007`ICrI!xgn90!pxDLc(I$-rrD>bCOWQTCCJl3%=G8o!q)D2jx%A?O zAToE+gC`LL4E3s@_#S)(4UfuX%{nrzIM-Jv6Vt)f_ja5-DQhT<#fBsE`iP%&3I` zfDa2%GzE1HsZ?O1;Fyh&t`~GRoAP-?>m{F=@Gc#%hz7^*%{Y&_rb zL2ZQT3XnLl>q;yMiGf}$!cd-tb1!hJ-3(G@tEe?c#YQMkeRxE0^!~&ny(DGgSb<3f z;f1|H9UvHcW{dWcj}1TWRTYE9D5AZvR0N$3`B5?t2_F$sgigw=lm@s3buHU210V<% zk|JyNGz}@5%2YB@+7t$;QSV^Gjw@>X(r9&?BG-09G?WFvlCPY3AJ^_6JG)z($49rH zA3ytW_M~Xsb5sr^Y#elCA}Ne`c1tUo$BxOsg*t$n-rwSI05H*eh-Ev`L&@z%cl ZeE8ruZY{RIyYJu8=b!$*JUe}T`VXtDs(=6h diff --git a/secrets/woodpecker-server-secrets.age b/secrets/woodpecker-server-secrets.age index 48396ff05fe6c77c99bb5da2f611dac671ac6ed6..3b2266bf78983ea1a1bba7c16950651ec9341908 100644 GIT binary patch delta 517 zcmV+g0{Z>61E2(uC4V+VVMB6vAZRv0N;N}zaZYwLIa6abK}dB~Rdh;uc2RRya$z%3 zVsJ2ZbTN5$b7N{W3Q=ZqRWxo|GEp})d3sJ_Peyc4P;qQiS~q%Ba#BifW>{`&Hd#z^ zF-}TB3N1b$b8~1dWn?lnH8D9LYiC1pOF^I5j~{3YS;FIQ^Q2&|_lW4Bv-B z3=V8jh=l%fq>K`GXWk)9@rx}K^4?`<36X{qS%iA@GJZmf74rB}c}WK9@0~Uy{LWCQ zb%-z=Pu>|~j?nFCNp6$#?R5_RQNfo^ccXh7dfSChccn&Z-?Zz_-Ta4$^@ryZk*51p zf^zSCo@nh{tg}YF-{rW4y|1S$W;7rO<8_8cIINxeNnOC^-~^jOWR7X9$88H3xgB!M H72ooL7wO2{ delta 410 zcmV;L0cHN61hoT@C4XyYLvl+&AVP3KZb~yYd16^uOjLJwL2PexYhp5QIZ#4wXia)K zO*2zyb4p7@Qd(3=3N~^~cwL2qVqLN{$MVlz25b#OFkYGF4;MR-wjR$_28 zWOq4l3N1b$ZBAlnC08wHa%Ew2WgtspNk1wqAXji8NMkx6Qh#C!Sb0!XOhHv~M^Sh; zS3-D0Nn~ePNOM6$LsD~YaZN@xMR0IzO)EDyMlU%(MN@G|Gcag#3ZucZ9u|&nqHZF?LS5&zbx(AJDOexL^Nwz zk5DVnp|Pw@5iF?zWuvixOo$`!$x_Wb(9fL