From 2875ee182b22afe028955084bda4225d5dc26438 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 17 Aug 2024 16:50:52 +0200 Subject: [PATCH] services: vikunja: move to fort Signed-off-by: Christoph Heiss --- .sops.yaml | 4 ++-- machines/fort.nix | 1 + machines/tank.nix | 1 - secrets/machines/fort.nix | Bin 13373 -> 12860 bytes secrets/machines/tank.nix | Bin 8050 -> 7931 bytes secrets/sops/vikunja.yaml | 42 +++++++++++++++++++------------------- services/vikunja.nix | 26 ++++++++++++----------- 7 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index 2d5f910..b51e98a 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -18,14 +18,14 @@ creation_rules: - *christoph_maui - *machine_tank - *machine_fort - - path_regex: secrets/sops/(forgejo|grafana|home-assistant|navidrome|tank|vaultwarden|vikunja)\.yaml + - path_regex: secrets/sops/(forgejo|grafana|home-assistant|navidrome|tank|vaultwarden)\.yaml key_groups: - age: - *christoph_trek - *christoph_zero - *christoph_maui - *machine_tank - - path_regex: secrets/sops/(alertmanager|fort|matrix-hookshot|wireguard)\.yaml + - path_regex: secrets/sops/(alertmanager|fort|matrix-hookshot|vikunja|wireguard)\.yaml key_groups: - age: - *christoph_trek diff --git a/machines/fort.nix b/machines/fort.nix index 4209da1..500962a 100644 --- a/machines/fort.nix +++ b/machines/fort.nix @@ -25,6 +25,7 @@ in { ../services/nginx.nix ../services/node-exporter.nix ../services/restic-client.nix + ../services/vikunja.nix ../services/web/c8h4-io.nix ../system/btrfs.nix ../system/deploy-target.nix diff --git a/machines/tank.nix b/machines/tank.nix index 952f9d7..499f5d5 100644 --- a/machines/tank.nix +++ b/machines/tank.nix @@ -15,7 +15,6 @@ ../services/prometheus.nix ../services/restic-client.nix ../services/vaultwarden.nix - ../services/vikunja.nix ../system/baremetal-server.nix ../system/btrfs.nix ../system/ucode-amd.nix diff --git a/secrets/machines/fort.nix b/secrets/machines/fort.nix index a2bda1ca7b7de56e6cefaa39798a1dcca86b4d34..18ef6d6939bee46d1507d786a08ba5e5c4b3dda8 100644 GIT binary patch literal 12860 zcmV-CGQ-UPM@dveQdv+`0GMm;ngZHj8Y{vu^Dr@Z=(S>F<30x>Vb_(oZDx;-f01KE zmQiHZf0@$Ad?=xgX21psIc2S={a-E2*UmqU)7{_-xFR~#-}t8TRB#4=blfY`o|>){ z*rD#!Vp%qZ{|d@nQ^s5DvPud){6dyQzf%H6Ls1G^Ps?RXwWT7?%4mAB*fIT#fe#<& zf*q=$FQ1WpGr!!X(+zrU@{5?WOSp(IYahX!h4%>FwAn%g*6yxxGnUX_{@|3?^-lo;q-%j*o}g2DpEILNpX zghZ`@(F4E4Y&^whhsN=BZwt~2P)rppb8J_DJ}MI5O2_-R8RSB@ZH0)xT?cK=X4IkN9ou$`Dw4zHcT2y z%RT1Pbn$~f6Yjd`X4@5j2_*|-fzyiMdAT;|<1kCY%LX{9vilfK*zRBRqU4^77_t|* z3o#aHVz8-6F^j{Kr-5j4CL+)&4)Z~Jg)U?KLbzm6s_X)8j0Z?}g_==czb3RJz7+0T z8A?ib2sEd3sR~`~;Wr0{05C~RTYly-HgkZ(tqfiLHo~MprM1bm<~tGHPJ$#95ikn% zkQPl`Wm|(KEX4CD+f6?g#ENBgA=dk!2#RZIXsP_Xqq{LO+QQ$5@5U=nN_LGkT+ecvh#UXdUOgu66p*t9A`EAne@%cmpq(AK2 zx`WgJ%C4WS*cSO^KC4*PFAEpBDE=;S$un_DBhgEl;O_B9xMpyCz|$omjYdHnO4xI2 z9sU0Wf9GC5BPHwZ>%p1PtTnM0p3PsSznJ@voJ`5Bp{z40dMVbbXgDLTTEnh4lf^Mnh&ZPM5> z*b4YhQuX11R`Z&@A_k07%8QJ!)(WiS8rLc%TL^`|1q3NZmJZ<4bFh5n|QuC z9Tc7uhmr$0B!hNojsD9ePl?M0 zX}B8z-`<rmY(-$U*DX;L?82403QAdCHfcKzu-C$@l{;_Lby4|MVopW zKF3#B2cS?Mj{OcV{j_8KpLSB0D1s-Tv%!mjJv9AT_R!R6E(t0yO;<20HHHo!pZi+cCQ z+ns(UkD!-j)lZ{l7fptC7LG_tjYOFZ!eOQ(0{tJ7eZZqv>Vke)R7vY2=W7?l% zBpsQ|QO-{mQS;a@kFFgy^5uK3zBVL5s^mNC|H@w5v2(Ikjx}S`{cZ#Wh8)IpGNGsK zQS$YS{s?%A*24jNq{)d_0ww9#frUA@z@sfOqCaUNLHPe^#lUCKXV5|S7a>)Rwa(12 z{8!JS6a-?aEF(He`dwunByF{i^r0h%K15V+%bz0xVqWy`3UKu&uF9e85E|Ps-4a=# zPR0>zHR~hdhRFl8ya}eJVYnsX7xdBNX1(fp;Xt=@hE+tqkzS0>5H5e7WVI%EGv$vj&RzZDQfqB#_4}sTo zoH?8Vy=hM9z&_ORPDF?;eVJ;d(V(Wo?$F$})IPa@FC>8{o4Va+AyMM@1w(M}!tqa% zX$N3ZfvF$H-qHKwnZDbW(|Jj@ zlPKs$^HqY#xJ69T@MVioI>mZY(fBY4CcmZxy{FX@$pOz(I88kyT4U7?5weYodjgcB z7Lt9@Cu=KxSKXV$Sj2TU-o3PkF!xXFioZ)|>8$MxJuVRw-oeKY<8G$+v}8gGBoY^S z`GI!E-(6H!qY^rcj1agmNh(V8AX}!IGTNY_w{~z%=fQCE@)0VfX8zgcdaPd&x-eV0 zD=#cfLRXyFX7n_kl*y&EhVg1d*?q)T&qOpf90Y zX&66~FG#AljvO^19lJ&AZa#r5@!pE2l^hTFl1v1!Q(Go6R-{Uehcz5fgnSp2&3h8@2@7;JpU70t&&#`N}rT z7&$A^4GG=8a6d?>M0Xr0z{65P(=(tfvl_JR2Sz54znrVy960uT)5bHZ8FDz0x(C;r zhVEG&*&1q-rF?e4J;Dnf)y$AmJmi%;li4J0jcLsq=8CkI@&3A0+^b6zA!o|laWNDH zs>_{&ztb=I+X|u6_38Du4inRe1%H|0w!a%7fL7#?8U`HD8lOvL?yX%&yU+) zVD>-Ppd_nU!m+I()@#U4n24Z&)waj_FvFNZ=MQCN3RduN#U_rE^EpDQMW8|II20~k zI8D52TbcH?r7!_|e$h=7Ggs2)L8IMjIS%$r^I~OYahu%hFd#?B=DT!NruIi1ixV^+BXmHF}IuAZq*Xj?vNUq?l0>Uq^l8Q0^y{L#{9+a};b>HA8 zQm_Buy{00K{$KC77NWO{-nso|rpWYa(0JJ@&KeqMueHY`4~sI({44SG=@eE17tU`N z2zLI-z4T=T&Sh)DO`IV~vc07k14Vy3)_eD%YTrFs;8TE;&o4FR@#jbvHaV7P9{>Zo zrV5`Mf2AzGl7_+?+pmfhj^a%$=cO#AHQTw>fP(B`O7|uOsAhCwz`)WF{L2KLE$%Lo zD^PLnP2hExj2Epjj-b@mx?bWgj9D(2e`;^J;c0-Qmp)hyvw@9F`?xtGywZwd(NzY|Yb!yh z+#{~66MD67x5K+Aj?RoDL^Vk_^>WK{4$r@}?xkCzu}Iffhd26nM9cqXZ+xZJ zK?{hbhqz@c{98*03akUlFAb^4WDxzOL@idLUiS1{VN#GlpmrrgMHW%wAHB8}P6;5U z4&`@_HWiw~i$sZsLo<}$_N|kjhhD7h{`RwSY~8On-;j;5a@;xmq%L9q#ha@+5HMr* zlfeeM{xF|`i}62JHL5j*l!q5~N-;85FWm8_A^)w{1*t& zD9SE4=6F{e(J2;44lMnDA|rS$e6wwoB9hs%$O`_C7rG!nZs*0af^W*HUXGG0kICzv zDqNhEkbN{bSs96>17y1JbUl3J^0qiWQnMBjD%gB>SSu{xkC?5FvmUW`8f<%sJ~D9l zlO1`6+2P2SPTWQbJ3v|7;^qWqM(-E%{(*RJv&iv!NgGV4PA%uTBod{}T{*%o-Kd^> z%OJhK+DKuo+sr=UwfP|>GsWkORvz;w>8r?wi-yTO|5Oab(2I7zEY!QM))ouGbtn5* zmILCcmC$=~albN0FIF-LhE{%oZ+G8W1P8v&EWVNbITm03n%D=%2uO{>Mt(}2c3FP; zGsrZhA~2*6=};!z!JZk4AyaR*Y|#nzm-}e!@3@Kjgo!C*W6fS`VG@`-T0V_GZ`sM% zLwh?IZ5G>UYtcOk5a|2zjk2R(t^JZ37p#Oj^I=Y02uQcyDH9`Z$8s}odg!x1;wvF; z1O{LUmm_+~PDdfg*_q?b973Qrx*kvAo35|J5{qyS@LW?H-_J0|ZZxwNJ-~!28~`8j zzIRB=NgPaN={@H~M9C=&knW~RUSQkk29N_Ry@85NNxHY&l|rCo5Shv4Ypi4VD4Q1%?W%iEa#|9Us-IT8ZxWG8(J}ppeoa|ZQ5Bvh{=*=sFntmX zWHn}tnSAbsEHr|P<7;8m9`)4F8*$1N9=nJ>Ul=Vdxfz_CSBw5FHhG*zU!G5|7e4cC z=m5LmsXe!z`(DU4SjKIxxO;Ns4H@+T75+AAn^HvNggk4Q&zTKbv1kz$Er<$?vQ2*9 z=i16hRrUraqA?G}*e$pE*y}5%m)C^(;w6XiCQP6~UWiiSA~cDw6_#o9Wv9$N?ZEI& ze%_9RQ+aVK5|now`w zZTnj%+b~bS33$EiGGR$Zrtt_COe<1CYx~r}q1$)q*X^3VCCaPxOPp?!g|s?|83gLF zwU*JVhKUH1XmDOhWT81t`GwI`rQ&u#q>cCKkO=y28@px{twv@|U4si%HpUg2|1-+5 zzrl?>6YE2U^&1K}<2w?_sl_fLsZi8cNgG?BPJPEH>50>&w!ajr-}z%n-0LV4!Kf(u zhpiw_h0FV2egW)n;GJt6-&dJbV)m3g1Ni2>mv~f3R+UK2B_bG$ZS_nH!9tA%zKOEz zO6Jmfax)7$eY``s%fO>5+2)Pl>YXVmR%B2(o?3xy?)P@*|98|w^ZUa$`O zIZcGFf|8H+^Olqn2P%0xYy|!%X$Pu9g{p}*H2jiLFwf!^<=%A=0J-Uhh)08Y)0ij( zTjh|(n=fINh7Pq7qy2)zbqWfMJL>m_m78y11&$R(;G`-9dBz4=b*6fM2fX2D1KND= z!l{RfN{OU2E^p7|&o>Ggt_4^Lh(!xlX2Ef?s{;6Yl#d?9wgjgmC9<;iyZrcJ11oH> zEA>#Vok5E?skZy_C4?7(*M;2UATvrI79iKuJ1s2ogu#?0ixWYDDnV&wK1dX@6Zy~} zAP`dGd(-OS3o&^e*CZPo6+EVZl%u#0y|JvIez+YpB&M*Y3O;OBF}Ur3=e_D9ApcCxcsOzG*rQSU6oFr!al!erP1+gZEi+F21`E z+K1^|-CCG-#powvdan^LM`(Z1@RTHEJ(CUxiaReHvjBVszO`0m6XQMS(^2J)(cq<& zw-r!ITE38dJM%q`gtP>xqH9DcvhYO4>!L|UGViCm38{9vG;)6=yf;MNOtOYyS-dZ= zJnFF7fAg(dku z#*&l}f_UNhkorWf9O|9r!kc^mED*A+=i$@M(KmCO5l?By$F1P@%+TlyC>n6Z3nP1t z)$K4@AXQ+F+=fpmYNn&Y+p-MGDZo#&4G)M=mvQ^M$Q`h6m6TZ=10uu$h?P4#LAD)F z9SbZxuJ2qc%FGur`^_ZcP(wIn3?j)r)8c_sd5^hAQC$C3uJq6EQ9}0ieTZ&zoUT7f zEn%V#xL0zNv2@E53)GEhGHK4J4}Zxi1*D_)3hzMy)zCu=jRoJIQfw3_rw0rqMu;=3cjXk zFE+-qd=5E7!8U-kZ+E=$U;$TvQ2|m=R#rR-qd|Hx3Nd`upJjWIZRmzm)0qx}NdEdwYxrNufV%kFlb=qi6s1RvhD9bZ0DE=z0c5~|oPH`}?C={l4<=l7P zy;usHaf34vPh~v2XO(zKs2ECe`AoG)^RG|xQ^BPUX?TQZ#1P=FP*5@M);JO=B54fu zXyH`Y9g?Ycz8<6C=qptU@09j0k~z2a$*2_T_)n5zlp?7;r$a$eY|`+-#VuL$^P;l| z4Uw`gs;_?hPMYPODnATAntW99fB}ybi@fI?v3QQwlPv3*3mYqr5}xVe?_m2|Kk zmfM_kd`p$QCcfWxwPJyA@40vztm6@R+#CQQgwZN{Kr z%(_Qdz6Uw}pECWkb%FQ;bKeVH(dT_a8y|wdvX<#=Jz>w_)Yf5Iqnk7!&)hEBp3DT+ zher*?4jaFT0BiQZMxy>DVk{f#MK@I-?fOj% zJt5D=As!cqI~moNB#Im7oHeX*2D+sRoz3O`;IEnFrZi-CFVUh#rMB~G1O}snZ6F__ zDol)l!*R&&4eoQg@$~L{bwOj_Jok6$uGNXJo}1sk*6mvPODlecgapM039!ks>Z%GM zL5lamj2iB$m~CN8jDok+(|31rP-$AA@L z7OFC23x*}>Cnc0~I%JCZCock9X_`AM&t#{@aClaQH1#f~hI9$9QuF{4pabnT8T3Tp zYs~yEm#k9o*uO$^f2<5Y1-1dHTElkr#=wVP2WElw^MkY|5HX_(j*K<^<)@Q2M?%cg zcJ(d)>Ol35l|f^K)d+eKQo9d?{-t~^>=wpbjwIa{c(c=l?+EyAgN{2<>% z2*AKF=581z#|t}Tf7st|vi3Dcl2yfh6uvW1UR zdgSQm*w3$-o*%e1cW#uz17s_-M)ZLX+r!YG21@Nuf&6DV6{+ggjJ!h_#LSF(X7n3u zo98Pm@<`X@l|?eI>1jgdL#8tteOV$dL)%T!(W+vTbH1Jxe{ICa2TjerfQtK-ewNKr$hhhKEKOs4>8Ona>k{r#Ds|2Z`pvkJZgZX zWpo-_{1jxXZ{mSZ1%k3vt-kyaA{g%cIX7Q6H#HHw zRhH;EV;2dFh(f!#zi~%@e~C(2JJzUu3tQ0_Ub{!+L;uTAmfQ8#QVz1oUWAZCN_Z-Y(IEmY8C!tq|s3 z-8Aw`hkKYU85#@)C~R>=x+x^u?grI_Fu=EM#y$k#OO1#7Mpcc+x_0vfI&S`%Xr%mKI6v(w3*G zyxV7YP7{h1%n_quPpI{#@`Q_*0UhSqx-$w48E3|ti!{2l%>R2Pr8A_Ndbvqx^`9@W zHZx#Cye){a4U(CB1y}DmiXRL*l+I*3PWo}77fWgI|AZ*$04UIpfMD8VY0)E+=`n*a zr^WCcuSzfph`u8jH5m4%S+v^7^e3x)2mm<&I`v<+DY>>{{v(-BW`@%IP%N zN_}v=>(-HBA}Vqw%Vi(}7G(Rf3tG5gWIqGKX`%s5y#6PH9NUIUady1%d11VxGK2mI zdIq8fYvgc#9cZMaUC5{4%}WVwRxyh{OAE#Txp!`-Lt$xH?Ld^ABIcovACr<~+v;|| zn~||M8d_#;h@sgZ9k}(1~ z(rJtJXo}km-p$9U$MBtzTkAk%Vk6tb57`m_1ojsftZ)LUXrM+bH-}MeYLLsnQSEe^ zujpgMuc~Nu&~vMp+U4T0t9VT217WrdsX*)3{s;|H)!{#NYBQ_kUZ|*v+~^6G#XDqaBMfU6%P2HYs-o=dC+WeT2*_ z62c>W13WIR;C(w;kaI13HXN5>DT?{{f1J2Ohy?;R zl8?zU+Pi$g-k?9#VYg5?9-E6b-`|>%8I3HJ5oRSM#*r(%GVK*8)Q=G>k-Ps^`wVd+ zOSm9xwX53H)lhT(yLr)O~=S4t1h?BQ8*5Q8r@ce6BB%?I%8(gdu=b5uzHd zm|Rxy2@sIT*XU=7;nO?+n0MiP6m)8de;r|2S#!;Cni}n1Ob82M5(yjGYWsVZ4~)Yw zJT!GrWS3KRo6S2e)$gO17>Wa~mdasy=W7zUVz9fxFt8o_fFKf2R3LAvTN=#Iqk$+N z(d~W1{13vj^cj^w-c^|pQ?C=Oc=Pqt`ZfHys{?w|fWGH)#6QUB}+5 z5!wO9LaT~C%ghj` ze;D>%gKUrf9fnGY1%fChW8Z!4=?5UP>L)ZsjB|tRAu{K(YURbim6u8=mp7>UzMi8g@<;a0F`zh9|Ab@K>w`Nd zi!0fD$~iMZoe)~j%pF1L)9CC4s#gtj=vjeiJbNCHsTiZrgVZZ-1^kDF14NZv;9A10z(wzQ$I$Q;LY7N6c%A}TRs>3Vkjw1=FoBJ!>>tJ-u1X4wupa! z4LHpDMWyYqdo*!wqr8o|nP%ZlrZJX5zmRDQSe#7oNL4O2o}NPkY==-QDvfeMMKqF{ zplDcUCEaMq=RbBvfa_=jD=6asUCj48Bth>4vs#Bpls(?cS$SV*^iBKuwwB63@dJ)N zJMWttMIK>2Iw^|SizNME+7~5XU{4ArP$py=d4Pt*Y{ec$u<(cW+h*8<1YnK5Vz{2& z<%nyMVk*p;bQ>(|WGco#OkHO9Fn&>uY24e`T&RpPdm7$Fv(I#-G3o={pP-~flsWA1 zA)Y3PJ^|^D|{~0wWT@=!ip&41+(dF z@-Fe=z^JW50#YP> zDyDk;A93O90L@2Cmx585{I#0%SL}G-lA^dZC{xa;A;Xt~2@7o?R-+t^5{qT&V7n1P zHa=v>8+9Aw^tih4RdlFfuu>rvdfL+l)TxRx*aMxgDM)&X^QH#BE9cj1B#X(YR+eZ_ zn_}&aU5eGB#e~Tha+S7s5_1V%w!xe<=;UZrW`%GPxL4+eOHMN95{|(Li+=h$)_WXH zQFs}9Q)7!`rqjr3W@>8Ckk%HMbDN^jM$BEXrK3Hxam8MEYS)TXZ^dKv9O#W^Z<{U{ zkwhK-E)IZFIke*MTo+kSL+}TT1l#zO`FV7)X>yxo|4#Om8nzd}`UjsW2(|)xhksim zBO`udHwVXVV|HZVQ3YV#9achM!2%$r34CUui!Km=hg)(ie-LpqutgLvAvCQHMQoAQ+gCW;K7H##^vlsd{~2>N8_* zN2xgkZ!z5a)SB@UOZVTpUm_)UD0?DeQz_Rp(@ zasgIx_Wk&XZR9-p?{|Uqg0Ea4fXVfJwrczusG?s>8%5E^EIB=RDSMfWi%0cY2D{Q_ z9zt?4j&UvrGi^&c7BOiz2@Ql{*Sb`OHasP*iGFRGmtB1)7j9#1xVy#T%!UjVCaDj2 z#}6MDWuBX4|5R}5nKknq*Gb2-eWw|1gD;A(VIT2Izt>z4FJKhA6jXUdlR5+D&j>40BeI&L0<~)^YRA^wq)9PfQ_J5dNqb=m^UyU z5py=ql_*m}+3rfDu?5XZCY2Dts@~lkpDk38K5|L$UHS{9y2ey!hIw0K zb(w%S^g;_ISO@Tb{*vnkKK|5_vRE4;eI`R<=cYn)H;?Uy(eYBRfBka!Q&RJY@9 z(H9ON*8FO&*5#mUo@#v!ZUcdXPp`V93HXc${lAa(!iwH0K-A8Q z)(2a+&Bqc);;dn^hBahpmRU;lyE)l;uJ8ExtwKJB-`1w$#$$u<$Vf$vRF2&SaTQ(P z=F9evC<6$cyOuILy&rDN6N#fgbh9f!{Vj|N8FGG)1wVU_h1+km`aMESLA`ifsI%~4 z9phabk*5*cJ&#Xs93Lq!R_Eqnw*cfGQ480Iq%bZ^o~|il#=`sCS-BmGx*1N+>zMqf zp2DLB8)-wdi$oe>_&ke|usrQ91tqu@2!8n*EK z`Tq~Y4H-};9n14~snecMZQYs)Li$Rh-EP@HZPpF+IyjoZ?I6K3Si zCYM(iPn*jMJsPON7`*7YA-W~3H$wTs*HrmBrJ}h773q7bU$7*E^j$v&kQkAoaNCqI zFGD`VdKnVysqrsz0n>^H7wNXXp%G?{b7(O4&aT-#mNkq@OBF9i9)e0BGt!f7p4c6` zNg_SyV@_?h_ks@(T3UYtK1m~QQf9)x%|Sq#jEZ*ed*iX zFVYHeB1K5`{_3<(#8_PNxM96MK0`o-O#3itl(9_a;Jm9Z!nbUK9Ep;TXEd-u!_mab z0v$eoz_GczJgMvGFP4LP#y-FBG7zQGVyQzdKy@%k12(u0=|5f$=0rO=2JFC2bf)_w zgLhth#lr=T4{HYp({MSTP*YgvKYM`VkP))8zNM~cmou%-0=8p61?0}9LwpldD&B=Z zPiopk!Y((>N(#}2hkE^nxrF`(hs<;D&p`^qwiC#WNFAh)8CV-IFCss-V~L;<7H`JC z=z|D%k1@sHH5}=%Z=KjnDwSIz5T>(ovdEr39F+A0q>?>eDrGxz8vX*N{x2oeVv-Ha zoAnu#%-?bW1FSVQFaOm|ZSbbE{#VuYLI5+ESuxB(D zLqUX>F`U5X?4mrZgd3{<5ynB@wHV^098{)gw{EzJhOna8T3JuD*h`WtC+NU_%sVtL zGxp>{KVkGZtIhyE#_B+rpQ`>RqMndC5|xpCI)&dgT{(Y8h-(h(s$y8k5dAS0^_$ zK8w8AmPva~;Q~lmkUd8p|Jl`<|G=$rHfu8HeQP+)GZn5rWnfgr&-!n^t>3g|14`%o z?%{B2g81=`Hvn6HtW=(;B6Kvt2Rn`UD`UaZ2@QBg+8~OUPp|^nIH~|H=;vMI^0ME@ zL1y@{W*-c!zyr8#&^ay}+i~I-#WmIBZ*uaIq4TIW5qw0Ab!BPJmo6o*r67;~} z3vzHLsa>YO)WW}VraLa70_?+G?pnP6$OlWxX|@E)#0cEaeg$3^fYb`bTFkjYw>rMS zcF-aRu3zi+tY~(oXG8Z?pxEL-t_l$jrV~-tMNMk60dcoU^ftyhJi?c!KfF55NZ?!; zxP8RW#|9Vl^;tRfeQY$`*{PH0y>=82%x0Vlm5F!>*oQ?Eg>^rvMpbd6Mow-_PBS~2 zgHn(;UV^o->KicNYSC{!Y{T}m*Z}5s*-6v-?+fu18FP)*O1;5BZcm1V=6~1cb!78x zs^|B`kM5Zd%DWl!z#%m>_aJ;LJu7{U3V1?*&)UXmb0PboYL*u+7=oRT^KiD z6pX#7&pav1A$W>B>pE&MSL`0L?Wi}YBsFo;Io#xhhDDrt4R7Q_HjN{fw$Ryik z{Fvx?F=lXdQoC7ORjYzbPb?8O&cEjeG=3#m911UTm_ya9X|Ia(qU%J7qI8iCIFDwM z*MhYzr8WW75On+s?R#k&jTiH|Mw^d&DeKiXNinygyA;=~GUx9;<(@Q?9&eQ`dQ}vc z^(2Ac?#b@jO@%<%5hDBDk`kT#g9c~(cB|wI%?4{%JG;KAaq?A@Ck)!>smx?wfi&5j z2#iYhOIB4m$SJ&+T+wV{zL(92-#9DDMxFY?kJ%maidk_mu4m$igu3L0`^xSr?a^&FyrQgSnzYMm0H zDljXbkh=jXwxx!?t)3^}+`S+DYyZ^>F@@TU`%}oI6I%9p;Z$6lK{k~c+w(~#q2RyW zz*&w?t12s+tXY>TS<6U`1@gy2aZ04K&dIU?Ca(<2OjcAIPO>1JskKY&2U~Epo&+1^ zhu#{t8ImHmL$~T%;u0J;6tplZ%Dgf`A0J!7BY?{jF)g^mH!TjR8yndMq zc5$NhkOupLE9`&%e0B4czH$=%FYAu&?9bK8ap#dO7t`(_;Jl@`USl!RZ^{;eVi*tl zno~Wx*>g}QsYGtcBX1l_kQ0B2kENlp1|12(~1{&fsb{-jQAZZ51@oY?VW-?@En90&i10JlT^6EY|wt?5~RU! zlD#aiF-kdS+ZaxH;+SK%^~KGRWgPOXiS@El|Mc-uJw8-%VU9vxYIpR&jpsdv;i@bg zeAuyyOZ|8o>HF%a?-(*l#H zI(o=+!cIx!*6t+zE!HYS5cZT}n027hLvA%~8Y zby*#*owD3mn#p(>NQaI0qu^LPPQ?IDI-TbFepS!@^S-K`4#Z7j%}5?&hc$N}Yw=y` zJym#s=uu!~V%`Nd?WvAQur}|%7NmC0J}eGIhA9_En;kcV3`4vrYp!)=)qef|k+^pfYZxDI1#fNaI6_%(q2VLs-Q>0iMAO7EV0MBYL&#(drH! zj+kqby!q&H3(Q`lk;00l&k_xPwaH3BRqrH6+TKu;%~Vu3#yHLe4eX}?Pyk#Dn*-mY zpq7%PZV!NV>mema$(grKD1oUkEx|q{({G|lhlY3twb0~kTZyqpi}|MsZ+n))OX}{V z;@Yn+!WAfFyS#J;n2zg11yl!LIT_U?7am|(gk3geLB3VZs{l4Hb z(NDTa=bkJr7zk7rGSG>bEnhYap4QNqosFyn7JuT3CmnS6TFaSp8dX3XCKP7m{eV#7&ql&U{!7b!-`DU-l?8qrl)+33nk zt^}k&DT}K93`h(&!-3WdJ*&w1xC(7g!G$uCwhRRHz!obrcfOKVhO|~A@!eKFd_tI5 z@h`BL&U1#JnjIgpty^%y@62c`YR{wO+tHsC2mu{{V$YtylqFDAhCoiGht95Km9fFqVkSmZ1Z2UV1csqq?NvPCtTaSRKp3p5Bam+zPW){Nry7P8 zj05CyO2^GW$m!8kY$c!N9zR_GD?uiNzoCFiz+82nk;fyK7o%?-PRe5N;eQSDXK~uq zPjzHn(+39Dve(ZKt-n{CBCqbi7O?&L`q82alPkRQPQn4jj-sEy*`k(cdh#X%``mhp zE2s*NG{F#Y2fGJd&6T|yKb!LZl}mn0PBan)3lHy;{jw75mRX(s&O`e}L~Cu%(G0;DvUU9(Ri!^=>qGM%IkiIb>t%_VUIb5XqK8V&lW^mil@5P) z^K7IIb(8f!#$++t;eRv4?zcf|>Z=E15(j0wY&F@uj*#cbP$#!F$*W_LABQeB=tby1 zMZRmfO&v&B)koDPY00N_OPr9@Q{iCQt!y;_@D12pogBiItv@1)le;Jv$EiyzEbDS) zftfNC+>QD^@_aD>QBh>V3US)*K)30u!ZzaQNG)b}*}M{fa`?`!keWURme^DcX=kSc z2uNfhW-H+aVgXu6@CydUed$Kjp9_tNX(Un9I1@-+k9!SBnxquKd_~iCof(D$s73(Z zHU}Ra7nrUbAHEHIIGS3?IDq65(vU$OdFW;+&9ac#(ichN{{#QYmljm$T6cQB2Y*cx zF5fL7w*j(Fg}K|Zpqy!@w$7T8@>FgbfQi_~WM4YS8Tq^prR7~9{H_H4*q$d^uce34 z$=j-udE3k`Z>%hIr3louVNNI;18P{R-4BQkqU{7WD%{e}#k#6VvG)s|&$+xzeKb~8 z0Qhd*0As$9%bZfCZQC?U$Raw;=4>n^1|wMNS8UH&%5>)0Ud+@?4Ss8EkpJLNiQ9fY ze8;u}lFOr$Nh93&!Q>!8Ua{dt^QIp}Yum;J#wO(O=TbA;((oh_O4H$6^*xdA9JQj&J4Z#BbCk0;num>3Arp%i!hAZU{3FnL$Jh#v*QUFTLs3IeLBVsx8 zfET1P>W*EbTsg*3tAJGO08Jk<+Gqpi-Or;=>&0-#~`ox*H0yg9@= znaImzQoTJU8GC6Hn_8Q0jIKjJL-=UQCrwt zPW%~V^Q%PJB|k|H8Y*R;^$}3QVi@HNl_#CFlIYu_GxKN~uK#bAyr&l~h2 zR_{dt4=lU(E3kRG?HlH!5{ig@MEMPmNU)Z96zu`4+h%Qoz)1X-;g)y4#FEbVIo47y z3EI;V(-oD4LDPAF!Ljmv+nUxtHtu4v9f*1nn&J22oNQfHS< zZb@~I+Bp=sB?!s>I|_-B>T1If zTA1<}WmaU7g(_@-TDDWvqFp_5MDrR8-c@PeKk102tHb!W9SjZ_+I**(_td6vLssT1 z$0X+SM1~=Q7Z!o|o|m-%F|pH7q*&SON}EjGm|m%C*|Q{RJjD z*^J02B-@f*jp>InvIXnmF2B^hK)W#24RIAx==fq>yi9i*^`G_`<%J1vTk6`mU5jq~ zjknmX9tmnk@sf1g39XTteYQ!+t&DP*S_G-Ibc(eeo4)k+NakO}uec$;l(}^qs z?%?&-i$yTDGGugsT`uDTn?i{gaAN12o@Firly&BKcTIsX1%pY|{pb38FnFe34+2f+ ztCmUfBRAaOcw*(rp(PCoBl>m@9)7Kkxr>_@aL@ePOM$3SQ_jYAt5uKTki=uKS~-n2 ze$j6=((O_re(-LR9zTtwQWo#%4YHfBO23(fxJee&tGWO*QNqNyE|V@~FB~5-Yv+d6 zHM=Z?DM~x60kkN+E-4INo%b#!d_nB~mwq#y&_PB?zuZ?5MhaqDWbp;&1)P90th;g* z9zL(V$6aQr{EI0`zb{8^73 zws+KXz4oB)61yuu^d_`<~~M=~E6O z;Fr`pU7aHD1^jvPh3)yS6WGKN{LcD;VK1nSxh4Y5o8C9XZL-N_PsHy-9wK=n*Byqe zjQ6xgrnP^J9G30MrSR2|eRlk#qS&2Ba0rF{`V}}^BQHhLo0=lzN2K9-Fvm2DgJ4tM zXY>d(Eeljr?1;Pvj%tT+ZrpOjZ?*^bj%z}$bgV))_4!ClRo{&U8AAs_*0FIOaH7=j zdoteRt2h;NNqKNW(FV9;V~jQ9L?e`#nu2$x(iZ)KAw~d0=F13?Y~JhBZyY)KoW_Ls z4q*biU9;4Hy^pR@Z+meg)0uJcOR>uedb`6kIZn6`6QO`heI84EQKvWt$Gd0~>)Vk|J(hv5M$4k)IrqT$0-EJ8iX>)a{;YPk(uz>Qm^2fi`^8 z%~ycIHLokLJx&k!0KjZTVt5kCT0bIxQJhgG$bf-3eQ)4&y*nc8f@5pXs=7KpR&mSM zH^VW(W3mZ?@xxzb9&otgNMMDAdM?<=PLmIO9W^=tepZ z{!)tv{2;))1|9uSxKB&Ug=SjQA9# z++lW^kw+lyR)ElzN;^ArlzezHWfDw+5WpmJp3Vq;m<*;olA}|_$6e1E|=Y{{y+?eR8NY&%s%r|aW+n8?}#-0klyo2Ys z@;m9;c}C+}XWohPDI+%Ib5)nl%G2;6;f&pA-4B*`T*Z|f3!*u(u9Uss5CtvSDfbNn z-*6d(hDmNKYcPva&$_(RE$n{w$sz@VM6BAh9-0i}<9BWz4|lCiV2q-O{e^a-q>QwTsvbKaYvWqLs#R8)wx5yAdR5+~r@wFt`! z=FASc26dGgj4kmc_}{wPEV^CXlJl=k%3veE4B)>lo=oaM%^ns5AQ6aITh>e!0fhD8 z*9n11!uZUngW}Nm=l9`x1T*T^O~rX|wHO`i5vV7-qV8P2j`IWd=fxNg6B2~QV?9x{ zu%q+HUTHoG{GEpGy4JE8|Ehjg`kpli#QS|T)qu$M*ABpV%H3h?6Zze{Ag;{O)z2>P zLi5W-)|{SWLbLs*Y6f2^)G{F5v5{)eR>Awv`U+VO(`)B8H~ik7d4}=id2U8NI9QYK zIYMB4sr=m@890EQ_+$t{t*aOqk_+>I>H6a9szX5(WTR>NA+`;d*vuCD6aBA@nPt|= zfqbE_LFYbBaY|`r8v7L*yev#_d~9#+ESe;Q*%*kBYWT?TaQVf}g^IWLIOBDxUewMT z^fgY6;{wGgVMdnKP=4PFg!P5<3Zq&oMkcw#wjii`f3?;d7ttCv0~TvLJc{5u7)^k* zNG#49Zx}6rxG(Z8hJWrxG0uvTyunz7;z%C)~q;kGUWdxXeUAaxzd*I_FSA=Y&?;< zTn6fTL*0Nyhd#~W4e%-}X)lAMbBv9qu*gC3M^xy|A%@{5#T=Zur>q~EU$ex4rW>Xg z!kqUeR}P9O#%6tsK@`K_>0ljDsJ?neynZ?m`VvyX5w%LGV72OzS=(KLJ477EjXX+M*`Fqts(9NJ?iaTU2%7 z1Gy%(IoNS@%aYZ0oXG-3^Cs2;KDZD`*zBrEYQ+8d-nj81CQ{GB+;>c!0&4nulwflG z>`oR>ak_;DCfS6kZ^MNf9K^od#p}nz4^cBtyN z?sMrY2fJXOuFb$bUy27!Lfet^ci0WPpthBwDkk9W9W2=@+l?LIHvlBw-dmrCxW;pv2$%bmpNskarDbYrUaQQV1$lDK=xQ zUii9s0ydet?Bm&A`H+mfgmHD3LTvtLFbj!_Zm(acWBr&{qcJ&+>}J%bx`UV>Ei~Vl z3dra$4h9wwSv2&uC0Z&iAXkpwqGMvhF47tVs}i)^Z@pX_+cdwm>dsjedUp6|Q5kCU z(2P?DvPEV?)AeyAGC9lP{=^!mZr%4&5dy->X-jl!4T$u%(vWK%c1ps5H4_1{j$U>2 z5JemX;5T@qqxnddDG@~zNI~e`tlN18sz`FF9352W96pGwLihV4qELW+&TmyShT>w= zk^&U`3OuogPOw{o1nJ(`j*^J;;2E8WEoWgNva8?bP54;m8Sw=zyF~wQO3c$0j=Ud5 z8WnOsxrJSxs4o@j$M+^nus3bN`(O+4o+;z=1oAHXgI%=Pc3qoXwaX`1*iX*IK zNQNJj=0{-}`Y%cb5e@-EXv-KILG+b~t#ab2a~4hYJy$(dOTMc1l>nEYvQs$fO2H=5 z*`H>wdt{93n;ls$s{br$vGOe=zLX*?g1vOmfP`jPR;rd&YT$~umU#gh7&LvQz8!5# z)pDUk0O>EsApn?dI<~i>h}p>OCa0Dgd1&`@1hu=qzo5yH5wISHTDia3j{6!)kynd?V3&c-7cwt+M`YA}fxO=eBTN>Xg~4 z$@^^GU((OfbW65>?>+HJRySyk?>-_f0qP11FUkcY1UMF^!WPVj5q<+pC>R334}&N? z6wdZkg`*n!)>bb*VM%8KhCM!A2toi(+{;?H*3C1JH&V^Gb<6{~TQdbgCw^lPGiQBcNdnBSxUi zm>4y6qqNBsen{${z>ZcY$kerd?*=6PK7c#|bA`hqIMRB4^Noz=w9A73mac zHyGv3eBR|uF8MC1A^=BrXNfxg>8IhXLLT8-R5`VAs557J_o;Q<*Ev@}khv+x{9F1B zmWEjIIos44(A>wNE!4wapBtPR zCT;=?;v*sQcU;i_jaCvqC$2{D5~)%z!kH4yzDV@Q`yr z!&;ZkZVqiyx_&URcsK=AO+43@Upn)7E4i;uOOabb=`bf|%E@Q(zRsZ73o&7f<`IRh zfuBA{;*^hiJQp|9BMUMt)-;!fNtG%t+}AB8-W}klB*n&uIm65VY;4GQYJWIEDtr@ub#vJR-)GK2v{M zj!p6`T?Z$yRZWS$@w=MNuT~EYrq~m7gjb(lA+9O6xo!S}O-Ud505Rv|G#MfSCm5o|k`( z=d{2JR}c%Wy=~!0GPgXTII~^gx^V%R;+d_Jn_?WDqu=wpCu!AqFZsEFv}pl|Sz2rh z2AA{t#0jh9rCHRnPT(J}x(B_q;tt(v-sa`h7Vxcsbz*}&SzJo8Z{xl-`O`Eeio>~Xw8-+o(;!t6=6wL@l$`e1?Og788?b3 z*f}(|^%akKgjm*h^vA+R1+$zUpkk{ZHM)W95*Jl_;CXhj7(mOp3dIDu6GsoehR1*? zg?nrnj{2fv>YFgEzAV5dyOTe+fGEZdtF#=*iMug2;!Muj&X7vj9(w#-$LoZyZDw6{ z(zK2U@E*{B4 zY)_i^w60m-hN8h+TaQB~7w$FY2a%NT@r2#;Vr^d*j; zSqWL7<92?!-P-(GJ(2jE&CgnX=9$(Qwx;_J!f?znD;NgpCMut3wKnLYMYCvCWH+re z4N(VkU=|$}vQBiV2a;G`ojzNq60_q#|NgrfN-hzydv;MW*9QVG%uk(Jgle$-hP$c+qM@M%N?0HhrCkNU_ z#;{lIb>P~%VYn1_7l({2gX7CS5Tt_HE7=#|$TI(Ux!ejB{LIR0B!VD$>6ciz6g$YM zVr2g3NhN6g8tsM&=mJtxm`RRY>hk~;K~Y?ryT)aQ>+_XUvpo;Ie>-F*42uNbNjJU# zWT6}iOd*v}!`|k!ue{TDr{IZ<+tQ9Ce>CEOKWB2% zd%RQcY(p?&BP3vhSg@Mh;3E~q@64DviQ2>oFzS-Gq{?qaH2h*P$ArwTfZ3u&7;Kit zx`7`X1gJ!!E04I>$4}ge9YRBx+(T2890AgxN%+N4P#Wl~VK6cvHxwyfoECSy@`d<} z4bN3lZVMa-)eD*f!1(4klks3s(h-t1%p`}NJbu$4%kv#$k|f$iTk+-cl?rHY0NJz) zH$&}yZWw}1?#&apD`x8)R$E{py<~b&^Y<>aoIUu!Ga(XaO^h(FRUujruQ{leQJ6(JMZsu8yd**Ky&)T z2`=d{4%cd=Oeph?_-{+R1u$_bQXb=$qtL1QTJ(^p4%8coPlTkTfxEv}-lqIsHqphi zlTi3N=S5xf9NdBsf6=o@dm+1I%EK#tz41Wl*+CBG#h%MUdpkym@I~VhPzILhf4Fjs zeP|ssrEmkhXA2y1gEQc7ydhEK>>ii-YJOn3wr3Wp+q7DW97+!s#Y}3P(tI;1@4+r0 zZd18P4}43tHZHnP%p4vsNTEU0K;stddP$sCau%5f5T}+EtWm=UeAn{CpaclbX^>Ig=*gbO0p%HM^L*zeSxjTIBLt+oet@>b{A{QJvK zkW}unyh&JY85XF$q?h}4D{S2avsSKj4{Mv&IRsMqyKX|6$uHV=#w6U0k2WBT8LS zQY-H%UL8rpDriNc)#)_xrzA<>n1Eu#ZSYL6lDsPYakE%K$H3JIm)!QRP_< z20sp&Fn=Tw5^cI4P!5mlmuD?mejp_m;rAQI;>dP^Jc;A+ZBe-uTMp@N#Rx+84s3M+6}}RZ%Z~kws^KrUn^fpYOZwLG>3r z=0N}{M5Uuj_%TBBH9QMe`zItT$5VW6D>Vw^p)uFx#aV^lBk_e^StkuovhGrh@BgcR zm5?zl)2H0zX|bBB3^uf9C3ddegj39QXd3VZAGJcYcnlN^* zs9kRITlVNM$=?8dUx3iUugta@>^5a$nyG$=+!n=Gg0S11;W-cV>5$Pm#{*1aD1Mxu zFvbp4Ku&V%Au0cKIpFN6QLMFg$#5DQ&dI*5%g7JL@JKNj5=2AS=o2UG^Nr z?U1LF#OwpS!nhweDI&N8-44{395y~!4R30A5_!Ds7wmK!wf9~M*{PGDUgsbuEjLa= zgo_(OL+kA9;EzIdW67XI9Kza&Z>F+h$_dxFSR$tAkZ1z9!fAu~&1R)z&vr)jzR+fO zHED9(9*2f9QroY4P2y4`9*a4tKdfZ5mjdBJ%!*iyLPRkT?M5+qGa2IZF%;{b2gm@K z1Pkokh(PRHZZEtU1h@SY-DDzyJ{4q7|Fu9CyI3M-@ufl#jY;7e4^C(g zJqJG~aStnX>C+kZN~D`o*~aNSY9CfM69Uz;gTl1!BO&Hci*Y(+xLa*tVL#Ra9U*gW z31CH=|J?$KbGv#H(0ic0 zYCtfccFIfV{6R#($mobQx)9;a0?pZEoB43AhEn_bOFf57&8z-{A}C}dX$MSJ0Q_D) z2dYxHrHCUS>df+4di|S&2+ic}PQxG67rCie>FtZHOs;JzPLRhicd| z`M%Pu2K`W%9?&Y+f-20asNKwMKA^6HL02cy{-F8|{C)uU$RjTE2y^atd0tQwX2x(m z?k8=y!_1sSa0A)@Vcv}_j9mUh5fq;x+hv?3UU;!B7=&(QOm$B$XZN-QYAe}j&Uld-)2}G3YFx&ueoXE zu5Bbm#*=_sx$y33+b}&!?`IwFFa|P?E;xgQeDS77u#G?v_ipDSmu@ufc5z&(D-T@M zT5nLlbIB!tN9K2q+Td#hmYaCNVjfmN70Bg`XgMCaNgd_941$-lMX@c1P#bEi^hnC> z?gw46h$?iMTgdXeap^V^jVIcTX^QLO2wq@6*aPNX1N{<&=HAb$z}+=e6ZEE9>mbzrCkJAO13Z9}x5(jt0jQQR*S zVN^~A4}yl@ay2lBVlyUZU8NJcLCT-z-nZXeWA^%Nh^|GLakIewoH(x+w~T+~4m3nju@N`OKlxAOBiH`;i_xU`yZ=NU&)SyPAn63wUdNcOvM-e1Nw>#rM ziGfX-ZkLy*@5aH9hN5&nB0agqsdhv1Py++iw5{~E3G)#z!+(-)PJ$}wZq?ZGe9~Ka zDqTPu&X;>+igdp9YNsH<~@MUaS zP}(MqDi_Ak!?$BC`}NmX|C;OFBvNe-mTv!)>FRE;8v)U-HpZsP>WUnEAkTL`Wn63Z z?MyLp0NqE}HN_EVroEy=?R#gU{|X+(Tdeq!CbyM%solD4LpS44~LvkyLTq? zwi12cHz2#;pDz`cT{TclfSSXBPP>OuYi;L3?rDzvA~3DZ*iQ=hZnV10Z7%9f2k6+$ zp8je7m94CC8?w&EhZK9iUXGBU*EM#@yp}YBmrLnZz69s8Yex>9T5)i}7bgC_$#AE) z*F3c<&y+RQd&$sZVzQC|98O6MrxeG=_2np9N;aD%fWas6i18`|yjh1=xo%G--+;2* z_HC66kHO1>y)pZu$#JI}W8};e^ka_!2*@4*w=vf#zoKQI_fz}bZ#D=BX^So|>^?Y9}EgUHmeu>$6SLqvIPwwnu8g;b2adS&E+gZ(*D(iO!5)JQ$vH%Zn1R zGfVEc#XSA9)ORWna2Fb%wrCY;n078VhbZ`Yn0w@yZ^x}#Pt#q&fc}F&T}i>HHVV58@UVKuz?{g#N$tEx z-y(JGKn^aT_}S3lS7do_oh=74c@PWrTjM4)%2pl0mQ@&wE)RXZR$OPryv#p_+qHs? z|2;N?PxJO(=Rjg34j%mJ7m`csuAvls0Bz_dZyztGSY=}I7-}$tSVsXHro6{Jer^9( zbeuYDCe#Aq$7BF;liY`#Pg@f|&(VyKyJxQ&% z#9UoJ(G;RxJLM%&^F8WnN?=(Gc~k4Qyx^!_sbji7hn~tqBr`sWxDNN73XwD0vCw*U z4uJPk$aX8Ukq zS&SO^E41Z@>|CGUox?Y=l%L?0U#RtFbL}_yENxJbE#|w)ffbdua zlFSp9cNw~;tu1Qvm(199tV8)@j@stlV~$rfZTbX~yaltx|Dv=JyH^|UJh_Rk&TTB9;A`4f)P9vqK!WMDYpl~a90W* zy;&L`mzpk@BL2X{TA^~ei3nU@bD!_)NZu}6%tUaE@BpF$5+GAW7tRo#f`e=v zauJuqj^d8aYU%1<^dX@AmU>8j8P{fMBu8)N;FpAhf-(c?Wpx3XBO$TF6wK_**7>?{ zGQ(2GAs5RCT70RKAL`%W*g+xd7k^b<-zeT(>Tqf$TF7e;I&kL@uy4nqE_gtzq*4uH zlB9U;qCikr)08YlTu*rE&u)JN?A7_SakQi8DywRMH+oXCEOxdKbcSWgOF8HljW?Ad zQW4Gjfhb&ez||G2^5fgO4T$S#T8*jY`5aGpO+1$s=^{6&oR$c>pXPVI{NxRT7@ukN zh21v$9KYU~#z&#P72!P61MaEkh3WyB)m9?3Cg_(O(-yjO8&MGLP5o;$)yO(iz)JWF z3$|%JNUJrs_isN7#US=p661alX_Qb%O(P6COYlU)AY(NGb88>*)H7!cAfE}k;B&NG zXfwrUM2GP?o zdxgjuyZS{?SYOTkzHB2BQ}C|!SM_{3<^{o0pYihjt^{a4L^EcD6fKG=zN3 z5Heven$8#rs*Uf$b~eb}uPn@bZK6$iwnAA{3e6nI&9&+oe-4ufS-(L1PnCoKQVY2R zS2>^nikgA<_C!k&*J zHiIDM_L=m9jdMkei>C_X?!uX^#8#zuq9Z}Upd&z(b|z8HxE3Dd;Qc+|8aW|kGwDEK ziN}BhFMu8UKKdkj%n!xg+SgGhc3T`-AcR2dj@%f5tHr+ichv-kJYSB~68rQyn(kJH zBtx={qQR}(Zmd1NuODM`t}(M5qVz(E4<3?H#0i6SGN1Opl?lnt##DjMCwcdr8JL+h zfrQD0If5KYf*!-a5VcFU#DP#`IUm9gwY*TVhSxawH6qvW^fd4QM&~g5#vplX-xpmH zC3_;T4Bjzec!q1Ir46Q9N@*?FL9JnXzxO-F&z2vu95ynW!>P^!s_;Op4m-EDbub9!*!4GG)SRvl z8OFfJYF|)PsJ$sff3>u;M42@&mi=$kw~6j{h6?b-sXt>kEEp-ktZ9UbD`ORMKLa}u z!*VWw4>1j`(;J{9CeoTHK0Gh^>zH^=ehlE`p?z?VN>%K08Nm)#ynd;?$CZ-$_CdL7 zka?VvzBo`XU0ss3dpjnxxu4f3*%ZI#b6|$QURI#sCVv-J`)z zyBgi3nJ#*81@x50*KMaJyU3m>YxL6%q7MOjJjd^na zFM*eYRHkdX`xQ&%yXkqe0>O#nezV_;a2Gd(w}AUtnu%KRkR{xv!jcD}{_$G<$QP3=@!HUhAsL*spl%h)!?@C&Ub4v2 z^eZ?*{I!I@3y*43mm2aG+d+}o{ZK}h03jgauGMP(>1xA=L4pWhpSYj7X>$hz)tD{H zV+(Y1Ja-f^06dfrtaJ{k2pxE{L?Q=F#tZAyaRz}IXd)|ly zE#T+yc*laZ-3iFAeJ33&5QBcueeFR%5X5i4TULo5QNy<{O7|v@p=o_sm}3~H<+*(6 zZ5}!RF}awlYp7Y%XFvMRM97C8yd>|=r{HD(eZp!z*V7!y2Zv9MOFdK? z@>90BHXS5XY47XZ-PM&*GL4%8TwrcJERs*4@BYD^G)l%4DGhpfOZC_RJLw?}sAZw3 zrPd&0i$XOvicKpYPLvm+Z&DwJ^$vPs5C(aHeVv8&LP&)itS9j64K)i^ls`fE{K zUtdS-;(E25!Ld97)gTVr?H#>;nS_MdrPf7upVK>AoxSD|s7c+qgcC!^J~A8;Ytv z9d|51X8Cu7f3m8Ayw}#P{b4H|!+%$mZ&NqRq}cL`Mfjd*G}kS16TG?NyeBdKMkoc@7CTc~0@V23`4)ZOc3|S`Z;SykA#&Yvuj*a%`5P5q&C`G(JiEFst5X9c(80YDdkNFfV?fWX%urfL536jekpHdq*|K@(+`F4@lT6NS5ZeUP^ zBk6zppqr7N&tPq;#K)*UdF@U~@~GHE`QLD__c4c_(?fcEUY=yAPBF_r{mT#H)&Xts z$=FKl{{lu}z>Ty_x(ujcF7&+&afG8uMm9chqm150A~=SJlvZW74Qu$S9!vl3Zkp!9RRMg{gB(mea{yGdENjhhDbDcuKwFK)y6qVCt- z-UUuw26aKjKghP8B}i~q+0eq6hzB{KE(GSDsl72MdsebGO-DkUy{P_RvPcofym|wG T-?VKD9dqW+u%vQ~)C2J<@KWlD diff --git a/secrets/machines/tank.nix b/secrets/machines/tank.nix index 005719819c9147b096e83316a83d911560ca70c8..2ef18912b539c3248a4ea76a9f9cc121d7bdb561 100644 GIT binary patch literal 7931 zcmVeL%92G7TSnq-NN_TbrG8&q$1nVu`V4X)=+?kw{Z`(Gvs1@ArUy51P2kvx0>Dnp8 zH@Hl(Z4E6ww&S!oI^YmPk%`Csi6auAbfc1WA?RvTpV}Ct%%;Wc<%LAZX0u7}tJ$=7 zNCM{Z1bDZz?*3Q}h3~RUbD&_K{{?YPZ>Nbjd9(e8@1N5febtPqoUKJrrCgPKbR;y} z6+mH{!JGEOzqR4qJP`hR9fkfPeI_PoxF+`?e2s0szB7%_Skn zZ47=CKTLQ_CL;M2~$U(SX3tbHM&k8!gtSyMsjm|yh)afdxl2iuQk9fXvhM~tI zQH)ofq~koBOk_zWZ|^duNZ||wcsKg?Bs#j_t8R(Qsk$KtEuEz?vPK-JO*$_)Aqu>_ zS}kkTAnMJ?Gk(B27(TJ0d%oO(m#1AeTURlI;OKm%gIcGH>YvOQ^m+lRwKp?oKHSaFz&^?ZDX1~amB90RjU1ba zjjtc_;23;)zsdF_;rsU{WcmxFXE5v@!&4;x?9h;{7Zq&fpL!QbV)gBjn7nnmeN8{! zZ-grAF%vp7@sCGemh1s#b#?vEcr9Y z#s)?ut{a3kErcr0x24H{JTDScRA5;CU(by=dGK|NB0(wmv057{gJ9UL&ljBrZ25uq zmiB^NldH3%NCFzFa5hP0m2j8h61g*j)sl7G3Kx&8+6+B6$#zjyD}h-0;uG5o{?ELj z4}-{>uFDMyt6k?+i+Ftnh73y`r&n|U+*j(kT2r=GOM5w{2 z%W2^)r8&1eWgKu}3Im>O(!>qaI!XBX`qPYfp10!cm6&Bd@E?%3kdpu)7>73|(Cpr6 zs-SYvD&nCz6qx!PHs&Erk|)rH|F%#gg%deu`ILj3nar6=l93u{>U2 z?>2P_a~0#wD3U+tRL_R+h!2K0q|wpyFf)1liF6ybv|?ZvUPD9~{sEWqH-dctYErQy zP`nG29=-B{0jaUAPn=%_M;5`gsb@^NG8UBl!&lu#PevJLbg%${1x1z8n5Z=4c}k%sgC(;6MicP}$oQ|l2H zIu6fD9~MjltEnlAO)R~uDs4w|9JkZy5?t^Ud)SejT^hk}1w8f_FtSiq1J(!Fyo_QA zF}1IS`betQ_SI~q1s z@D5JXp!9`%xX)ErftU%a0T*?qkR9g_BTA)ZjH_i6i%zO8nIdFPwbFb$65*N$`>twa zY;%fM0^ZN{Tmi}!HJ(Y8SKPa3vkxUjRYdA0L~r! zzf&S9+}Memz?sR0?c98?ryKTbPxZdS$BEcQUxAz7Gn^-&C*e39PGJ zwE(_pV}KRUwx!S7&lDoum7qr@5RKey0`0k*+D#MUnOgt(Z!s|8Uso!WzRD+&iBcdd zhfju1CZ;EH)re`gYCK5)rzm{S8)aZo-ZSPG;#xL2-Z*|5`nz2|R{y{gvldchzHCyp zKz2!VFS7~{+;RQpD%n>9s4icVon&P3j=md#U@xcL$jrp{>PKEZi#qWMv-w_A?-VpO z-r+^`cfNNn!z!M_G)f8kQhQ#Y9_hzn?Tl7WLAJ9YnIpk30$yy`CtTHXi$l(<`_${$ zEk~4AWaNsE)7lilWw4ksZs!QF&*!v}X@R@^L2P~-XM_#cl}=ReGsxbne>jbyC5-|A z^M9)Q=buSyIv*_l7#K_hl*aVIjhOon3@+)oBdXbwosZok+<@^(myL)Qm_;tP z3I}k19f;3^Nr>~ykr*tsNtESaPxn@FI>N(xpx5^)efT`?+LkO_L?ohc7cmw@#{+AQ z&epVjX|vjmY+BJ_d7f*amfS8eYe?om#vUpyLi7$PEI&$iT|7mGESNoA&>)@bKHKNA zr69HRA*tZ`n&|c!a0ii8rhg_g(p9T1-M}eGVzw)PFpqZim*%AP+b5BJt>RbfRRPjf zKGSzh@9I43#7**(e;Q@ArK&Yqm+6!DjRp;qORnoLsKxKnWtTTM$F9ZHn1>8&^W z6V6$w@Ih*5qE9p{*Lipr=>+sdK6@oE4!r4F$b!x8KNqQ9Xzb_mNA;2tj3E5>s;Vjc3`amIWYj@uOhMQN>R5_I8FSYksJ2XoeCA)<8>9h|W zyj2n+i8l6aSx#5S?da}xN}$8BYQV#5vZnG+ubO(}t%mWsMw(>VwgEEd|YG; zZ-d>_Nd%4DfEN#GO(+ESSO*8{PhqtW!2<^F3FIdL#OyMAh zdZL3l1k;7A0+g;p;(M&^%*V+-a1WB9KYfslx8v0{%{WK{3-Xr}5ahiCtuGP&5+v z$Y8`OZkRFTGI)fZC)wsDd5VW3F#7tmBWfAt;i-rNK0R(j6hU(eG>rcjI6(Qaa_oN{ zNyaq-a+c3gIGrkXqpI#fw-pDGVlJH@yehIGD!Oued2{czK>YWew@$6J8JSZ^&nj%r z4->E7=!YN{5)>VFiA??oJ+J701+JnDG6xEQc=b@hI+T~H2(yN58;s_4^;ECTCQZix z(=hcRl;J$qAki{{9toL+DyEe}@3!RlNq@v>yXN%l7kh*~>w=&6uP>Ar|Hd_T{C@~T z8^f|2B~sJfhhu_nhwF63}f zR>#yfXLHJ){Rc1t`-t zB$!9d$DoA#&NIE`-h*cOaLn9V=|v81Oz|0asPPB@hoZ<`joTyMES&|!OE=*le{6Ie z_1UKdm)D$jlhnZZeeFYVI8Pvx2Ytrkc;#I7+By%bwrUGf7SeazVlV*A+H_C80x%6@ z(d0;XX@%*gQ?>L}zW>2JuGYl&&8?|z0U2wwV;Dqbt-P=#IF}&awDR{UsPVUiIQ}p# z&Csb|)@uQD*yk~sgh9%9X*Bo2&A%2=sqsSUGtsc#`*EPp>x}%*AoDGWFL|-_(ZSZj#ETO5}pO;{}&SB(^_A2kn^RYbGSM znr842Vdyj4V4eQi+s^S4P*<<0PN_AzYt4Kj%<@Q|#OMQJ_Xe4gSYv9V#$`w}?{GUK zk|b^-mrNParM1COW3V80TE1E9mb@k~lz!()m3GLEB-8Wx*d+i08!NC<(=yBn1<$#n2;5iTarOTQP*KUo?n2Pc^NWW8VM zPds;Q7^FO$?W>c_Ii%*;sw;{jwWk_g)byi13d(pnG+KLqtWqJcW7zRI(M?&{rlG6t zb->ECaL>(wtUellsy}7s{nDX$2a+$>bofK*CSL^}ccIy};P+r>2$7_A>kkBHOe0$u zSVhBz^2!?G0O*qJ*qg+?0dOgq-3Y!l!VzdXz((dzW`AXcduX|S7hn$ZOHg3eK8MbA z$(TNH4hafG8&7-S01QcwXNwe_Vw&oQyo}>T{eRdSha2i#UiTFfoAq5ZI^a_Tz4YHS zbGF?mCXnvo^Ho}@4<^kQWnDPAWHVuW?Jt&E8PW^73+qCfh0j}$e_W_7N*dJQJB6-q zVP;|P2_xrV%~1jt;ygl|<1yi~DRT8w#y5wPf+?B=94D4-(|Pd|94oRMiWQ`vSA@?s z7E)Ir(9k}@1UA!sBUk2M_p@qdlOdb>&Mp%QZ*ram8RqSgU0z=FZu6TL6X)+3oh%}> zo&JyIn%0i`3X!Z)ml;VP;#JnO3Z_=H+^P$f+j6%CNVyDWDb1Ha|c zUY9lrk=HV@gxN@1<(w3JT(|GROXo>yG-H#1}dUiq}y$(%UB`*Hg@ET83f0iY_#Fi>RsGp~>Y( zh4X-m#l1tTr~>---|SOVcF_5NR{0nO(rCPE+e^-I5VN-5b}DJIR>Jcj+^j$fx_2`1 zsf@>}Z(?Z#|9oE0Wg7@Qg(0(kT>*8oI7n{V!dD#bTUP96V;=h`|Y=&@=KVJX8e#+>&*2!MJ% zpMhefGK$i(`87WhdJZf_-kXxSJN!@KqUyKoc35&Td8gm-bax?W*=g2~zWIMnpfux)+* z2-}9Q1``%uam^MipU3x!3oFL~Wlqc8g?aV#TnxJV?G+?NiH_5J)&N2||_Yd4!n63hxV!fg?EC ze2H-Gt-5azYpfdVZve-;x+YtIySvL>G#Vf|wtP4dHCyB^@ffab5mmW@H1q30*?4G& zGSHg-c!)pHgN0F|6RbG)nKj=WqJ?BO7yD5=rO)S<|J!tf&?m)k+NFBuK?UQ}S*EFs zHDJ9$z&Lxo0c}c0$|nA~N4w~J(;2=5*XOZjX>3vl?oxe2gJvj+GdqCHB_JZuAr9-v zoQ7M*A{b%rP|W&`%%a6tp9CzA%#4PSi#5lPk6RRc>Q6Tb={TVvEF0WR=}|E_KuF0c zN72kI6(~^oFyeu+vN-uHos@Hz820Z<9DpuTdRN$Ijk${3g_h%G`(t%!^JVd04_Y5u zj7k3H=n)bz&^Zu3p16$7D~p1{2c(VTUqY_`rgZsBa2}#~A~qIzNA|iC7tH2pf8M|Q zyH1t0%-9LqE(V4=^$&gfACLu)88S8jrjiVeE|n;Z(2~Y2^gD|Lf$p`-Bz?e=#^Bqp z3WBpA{y+a=~HF?L~E2c|S% zNA_MTn>%A@k{<;18E-)wq|`;|<5obd()W@aqw3$;oqKy~?+1PHZ<7FEnPko4d^JXoA6i9C$MT(LB=+CYKJZBpI0rPB~BpZzIcL~=FZ{jU#FW|bpwSU zLcmjSB)T14Xl?oL0LD9EXm+>ANS2IRFT_vQt{o;4FW$vBe^vK!KXYGIPsxkL0V6Px zfPntc=5rlHY0qV>(+3Lwyim-eg1(Vy0Be=Kj~;iLt983_7`nd#f}yxW9o~v~4mTg# zO7^OjmR zrZ&#aG9^j0Hx0W%;==%2Csg%PF0q#W$?9z62eQFxNc5^@k&f7A-uh|5JAnan1B6&P{`}-reVc zPY30>P`>v^CA5`vO|Kh7EKYbAjdR5ha~9r)0i7TdSNW#FH7lAjJ7pUh$k&PPcc%i# zET)T|eT8m(xOa80J==o^>|5~hgLhreCpEmmo?a8@O;e!t){TwLfKOD$vYKE)wk|s*wYB4f;9F*co|;9|Eh8dIT9{`HT~rz&Ge??XDr? zz+hRsnnQ{ST;|*AcdUs_X zzb2Jag7EL^_u)*_vp*>L~=x+6=qmo8((phy?`#;4M9ha^cwaF z(GU=TFD5F>%TsJ8=X6{z2Mn~N(6Cm+cAQ5_sm&*Ba=Qxmk`($}cbSMOkMn@O;HH_`I`Z0Zx-&cHj)ogDb3vN$%yU{>M|l3Hd($WLv2QA z&jA)Xc7F8Yi;W!l{k{9|%u-X~=Z_@TrS60cVrdqdL#`c0R>4Oi9$mJ5p!}h(&K~?F zB0?Xrmh)5z!ng)HiNJim8$mqB`jT8#%%;8j;$!wegYZ5;=|uZ?LI-*03KH}>((eo| z6tQNw`*Ep)1AO!J=$02p{DXai7;|T(kpBK4QE6+R6A`sFh#>xUn}W-I)Cn~1ELSgr z5}s9YM#k-vI1CViE1FcVMBEOTW|^L7AZ*2R6&e&?9Osrhu|}}F>SgN! zW|A!?;iv0aX=1rP5SMc1%BoHX3r*W=JsO$jJ5H_k-o7P*euZpZ)vWhy+ZyY0yB`X( zevv!mlmZPP@&XKL>0b|4*XFuA+D?I37z#pW9BaEO4eseV{TUBJqoepao=4s~9hNIvxs8fExMt;9)#q@b+!dQxLtp6nRZ+Q7a|Ss~<7Uw_bu9>7yjntE zmhX~Z+&*SGC_IDq$$g)l3IJEUhM+MG4GLX(HTr51oJfgKhK9Tv`-&0~JS^@HGFrIr zIQ{Q$WthfvJLhA-`Cv5L*U+FUScnO!ciDO1(0kkz-Wzh7tlMuSZGoE^R9Gy&wG?7e zFScsI>(g|`7DqB(pX)JX9_^f37AgISrK&k*^zslcEQy;W>(w@pj^ky6r zHBCeOIoH|<$$|&MaSSedQm@F6 z7l)3J_*gYmjTbn3zp?Q~Ba73}Pu}87uZ~<|%$)sMOplmv`zi54!;`P-=STe*PLH-- zooX?wXY94fG81RF$4l`w#Jgw}zuk=z^7AWIG7kc#LoiKj0odK-raZwqvrgTOVwoDusea>& zvoIq$U`fU%i(n{W5;Si0@k!LI6XAm|ga@-EH4uv~3mZYpo@HXM7{_K?OD!Kp|2UI9 z%)6&WTICCGLqee3)m=N>e+Ph@%e=n?-TC=0laS7%0v#`pwp8d<-EP;f8k`gG$7RSR zBUm@+HaHYf__2YHmF`$YPSvuf|8i7go|rJ6*vuLYlBElsLaI7NaG2EcDAr3pbxfJv zZ>wlP*Tjt(nk}`QJJoLtG7>g(nC)tHYJK?itS(J)C}y=>&VUnnr{UePtzHeCSIj?@ zD^Am;bgIMDlE+x}#8uCDeiVCv_KVyf`~anfx@EHTGaT2@nZCpcE#saDE(@lx65>%_ zR7f@$8}N7Ain}@JHPW-iag(!g$^;H(F4`9j)B*z|_a@1Y8D?3~j!M5FjIS!izt6KG zl7lAllwF->ZrzTI`Q)$(qKYV3aSitIf|=bve4SWzF}v2BH(i?U?t*eiezuGW zINNA?KHt^F5bmjd3!K{59Wh@8 l-UW&iS)m;286?VY=DhnXf~Xs8pN3yfy3y4vg5L2sqz(5#b9ev% literal 8050 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 A)c^nh diff --git a/secrets/sops/vikunja.yaml b/secrets/sops/vikunja.yaml index b293314..dfad657 100644 --- a/secrets/sops/vikunja.yaml +++ b/secrets/sops/vikunja.yaml @@ -9,38 +9,38 @@ sops: - recipient: age1kdkzjqy88en4m65s7ld28srupzwaq30gu2e63ylayhqedpgfxews9kf6fy enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZK2J6eEgrYnM4QmpaQTJQ - bXZpWk9rWVNUOFpaU3ZETlhaOGRjT0ZtMnhFClZmaFBTakNtMUZCZ3QxN09SNUJY - Rzl4ZkovNzM4OHZXa0J5NE1YRWU0ZXMKLS0tIENNOUFqL0wvSjhHVzNSTkVjWmow - eGZqOHdxUUhxWXl2ODRJc0FnRlFRcU0K2cD0+hNZluCV7mVAZ5sIEP0pTielkxQw - MnFohJYLhGsvcrQZk1do8/6qEFnLWsJawyDhI9JTeQIcZ/S8Kn3NkA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiZTEzdHd0TWRyUkhHbGwy + ckhYMzN1TUt5WHhmRnBVNWdqMFFWVUtVZjIwCit2SDRKajVoR3NSczRydXVSd2dl + aFFadjl1VXBybEx6a0hwZVd0aGNIbDgKLS0tIFUxeTQ1U2hGRGNlYXJwRmVQUCtv + bzIvTkRVdFVybDhsdVVKdlg2YjlraW8KwJT81+twdAPSJW7dqxyPSmxSsAPNYj6n + xx+Q8HgDN3DoAAoOYjGOs9iKcb14Jz+rqAc1MOdCCEElI8LaGTy9Ig== -----END AGE ENCRYPTED FILE----- - recipient: age1es8273vc2yq89kvs4s84m6qffep86sm924k4my47a5qtau4ueypsgz3kqh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyVkpRSkJyVWZnRkhWdlJJ - UWxxakh2emF1ZFU1R3BPVHJodUJKOGFML0ZnCmdNK2VNT0F5b29IckUxYUo4TlFB - Nm13SWNleFVqWHUyY1ZlY1dINVhzQmMKLS0tIFo3blBJUzNYZXdKZFFmYVJtWm02 - ZzgySnR2aGFvKy9uMS9IUGtadmxidzAK1UWDr6wFJ49CFTSAEaHARYKAXvrJju/J - xhbKTBfEvJfT0VFD6JF3qOlYETbxu/QbhNXME/MzQEjhutvuayw2ug== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqMVUrSndUbndlVnRsUDNP + K21pRmVnSFpmQnpJRVMwZjFqVXoxcEVaeUJVCmo2b0ptdXlUaEJKNTJaZzdvQThy + MWVvV3AyQndnSHQxdGduTUVyejMza2MKLS0tIG01ZWlQWVBscEhWQ3FlQVplVUhv + U0xrdDNaY3pOZDIvRzRkMk5WTVg4QVkKixgQUQvrGgq3vgbZlt3Pz35bFHApgpXR + 72u8QXUlThHNuI9DBVnvjgAnEY3or2EK9l+N1WxruDMyp0rq7z7P/Q== -----END AGE ENCRYPTED FILE----- - recipient: age1ul99nmekam6rs9fpjka32aaxmnjq0p3a8x8drzxwtxa4g2u23anq6p2g6s enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLRHBrKzc2azFTUnczSVpv - eUV2NUZFdGZvSFVwYUg5cTVJbVYyV1ZiR1FZCmZQVHd6RHYxQWlxQ2hjcXdxSlFp - MElScFh4azhhNTNjd2RlTEtsbzZBeGsKLS0tIG1JZTFoNHlHOVFpc0NaQ1hVWTJk - cG8zeTYrd1ZFckxSVVBFM1dLbldSbnMKP7Y4FFBvO77Oq5+MYc/425VrhhX/Hpvo - XJekxSIQ4iSF1XSYVnzXG9VuRt+vs68797la6+P830eVo05VqTyx1Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxZzd1eTA2WHNYTFZJNWx4 + LzlKSlpBcUl2dXVCVkI2NzE0cUZCU2FpSlg4CmtuRHNkSzdDU2N2Ri9RQVBJeTBK + MGU2dzhwSkZRMWFRcENzcDUxcm92eEkKLS0tIHliLzdheDNxVi9RZG8yelVjdUZj + cFlmOGVqZDJrMWU0S0VGREV6emdjZm8KHYWbGM3lZKnyuOxgb41/gkoiMimsg/6Q + LK2pW6GHenHce193S3l+w2oMaFWGgD7xrBzJHq7zUzuWYFC/XI3MaQ== -----END AGE ENCRYPTED FILE----- - - recipient: age165nqtky9a5kdhca70uwd0cewqle7egzm4vmcmrpfnqfuchjdg3esn7frvh + - recipient: age1h96sm0j0k5kjmuf857xurtq7rwk5fhptenjdlkgmadtrz4lm95rqm6ctm2 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXMGk0TGtJaVdNcUVsZUdM - UmV0ZjIxV09FdEpQU0VyUGduUkZQTHBKQVZZCjhZSXZ3dS9kUlljclVSbGdueHJh - Q3A2OVROVTFBN2VwK0llN2wzVGQwbFEKLS0tIFQydVRrSGt3bHpFSHFSaW5UcU5Y - SEI4OGxYR25VQ3RPODd2VjdnQzMyRlEKyZBVs3pYccrAo+ZFqDM3WQlH8vYPKa5M - bLqbOoVSvpbYwZwnPmA6g3SEXAqWQ33jGJwPAARR17+qLc6GHup56A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRSmpTcUJwRDF4R05vTkxT + SU1XRzB0MmFUOXc1UWxqMnZsTTZOZjU5aUI0CkpsUnhDRG5zdG41cFNsZGl4V1ZD + c1RveXBScm5MRXZhUmdiOXJVKzNQYXMKLS0tIHVPdzVldmxhd3VLL0hUYmZsang3 + RVpLdlFXUXlHY3NmSEV1bjQ0cFhPMFUKCgnYvkDW8X2OBR/nTFX+xEXOm9QmGck9 + jlBzZ7wJMt8KF1QGpvoPXrvI/htMZGkBgKuEa9m/7JlxEb0TjW0dqw== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-06-05T21:31:38Z" mac: ENC[AES256_GCM,data:lh0P1Ojv0YXEvYWZQHGOtBva2dmbouQFL2OGdf2AB8bbwZBvlF/3Vq1ngyTFOzCD1IXSvnF3S4hcCUWIeswlE+/CmaUYV74/3jQ3bwHhvP99RU7MIAHTXNf0jyLKSlcMHgHRUMzNsCpgBaL2mY0hWY0shCWSuOb4qUO+n009Yhg=,iv:+1qM0+O+kmTz93G7OnnJyIUJWsDh4dQwEzDJ5hDKZik=,tag:7eqK7qskFjqpcOUMfBdXVQ==,type:str] diff --git a/services/vikunja.nix b/services/vikunja.nix index 2990f94..2e0e8ba 100644 --- a/services/vikunja.nix +++ b/services/vikunja.nix @@ -12,10 +12,7 @@ in { frontendScheme = "https"; frontendHostname = fqdn; environmentFiles = [ secrets."vikunja/env".path ]; - database = { - type = "postgres"; - host = "/run/postgresql"; - }; + database.type = "sqlite"; settings = { service = { timezone = "Europe/Vienna"; @@ -23,17 +20,22 @@ in { enableregistration = false; }; log.http = "off"; - files.maxsize = "128MB"; + files.maxsize = "64MB"; defaultsettings.week_start = 1; }; }; - services.postgresql = { - ensureDatabases = [ vikunjaDbCfg.database ]; - ensureUsers = [{ - name = vikunjaDbCfg.user; - ensureDBOwnership = true; - ensureClauses.login = true; - }]; + services.nginx.virtualHosts.${fqdn} = let serverCfg = config.services.vikunja; + in { + forceSSL = true; + useACMEHost = my.domain; + kTLS = true; + locations."/" = { + proxyPass = "http://[::1]:${toString serverCfg.port}"; + proxyWebsockets = true; + extraConfig = '' + client_max_body_size 64M; + ''; + }; }; }