From 4199d6cbb146ad02b05482505bfa9bec236b1b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Thu, 16 Jan 2025 19:47:49 +0100 Subject: [PATCH] fixed some mistakes --- nixosModules/drives/default.nix | 5 +++++ nixosModules/services/default.nix | 1 + secrets/k3stoken.age | Bin 668 -> 778 bytes secrets/keys.json | 10 +++++++--- secrets/mypassword.age | Bin 835 -> 1055 bytes 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nixosModules/drives/default.nix b/nixosModules/drives/default.nix index 81596e2..ea8a0fe 100644 --- a/nixosModules/drives/default.nix +++ b/nixosModules/drives/default.nix @@ -9,6 +9,11 @@ in { options.kropcloud.drives = { hasSecondDrive = lib.mkEnableOption "Whence this VM has second drive"; + secondDriveMountpoint = lib.mkOption { + type = lib.types.str; + default = "/mnt/nas"; + description = "The mountpoint for the second drive"; + }; }; config = { disko.devices = { diff --git a/nixosModules/services/default.nix b/nixosModules/services/default.nix index 5a9d92d..b21ac59 100644 --- a/nixosModules/services/default.nix +++ b/nixosModules/services/default.nix @@ -5,5 +5,6 @@ ./tailscale ./hydra ./k3s + ./nfs ]; } diff --git a/secrets/k3stoken.age b/secrets/k3stoken.age index b70022c55b5411767cfe1e35768df74854385bc3..7e6ea462ffd35bcceb44f5abe7cf93cb129e44be 100644 GIT binary patch literal 778 zcmZY4y{?l`007{`k;Tc?us0RjLQ8YwRiNb`%Artbjm8#EfpS_XJ%vKzXf(zLFiv;! z5sa^)gPViCg4>l1wW)-mkDLs&KiPV>W)yo{-;M|5w=(<$k~sL!&!G0A3qZVkxV zTIQR;IdOu|Iea#8M7m%mIZ%bV~~pfxNQWwgGd&y``KW6+rZu5y~C?M*w`$pVM7 zgkl2f2IB0wQfbP@_vB#ip8_PyfJ@j})-E?5$8dtGtc@64Yp&!$vnIo^FOIOfstZoc z%k4&O@q*EUDFT)mZ7X(YtQ884R>y@$P)G)9X&-HSFV6d8%C($$<62v_I3OXl!62{( z$vGMC#q3%`rhBMrlJcvA?jTwaQ>@NQ3WYl-QcXv6grL?n!Hk-s{&m$D>RN|;F z?qd^ImwvQx?1B-EgfcQZU*ky1Heq7>x!(Wp2IK+@fV@<0DlMv$8VH@sG84wufIpfJ zb?MMd9q-k=EZH5k*tI>A=*?D&DF#AdG8Sf~1Z^YArTnm5g%Igf#5zn;Bl4v!cf;Sj)_K=1Oqsx)&HPQ3C6v@d&f!!ZA}Fq0FA!OI%1w z2f;)b*!l8;G!E*46lgpZlyXgUyIrzMb!-8!!zYEem7}@BK5DIa-zYk0&=48E#ih_6 z?!uV3d1QUR|8)Q1&GX;>$Dc2repMbfcdy=lyLtHe&zD~>=kq&gynpxOR)77RdG_Eh F`wwzy0KWhL literal 668 zcmZ9}yRMU9003a)$Y$c;;J|7~rL_D#KQS?Z7AWNa}*!Hk zo*h@gX@2W&?3tLwQmEClsJ97slBSzmb_O^Ea&}E{{)ETIh@c^;JWkTOm}Ec#V9yRm zgUTGOl6Qs_uxRHCfvKj~nt~SMvBy)sA7`GRb_}OTD-6_0YBkpE=#keFMq40O({kX0J6%u(wK&TL&1rY_LKz za&HJN6-Srei*s3s>e9^P=CW?UaA6jOmHsm1U(P>9GQ|~4V197T5 zRd?7h5HiZOc2umq>v1)&#+tuI`9!b0mE@w{G{}K*=)_RHA+%(_m3BrZ6iI|tW*L>| zP6Kp&GRtl-j*F#xs9|~D*D^N*-c5gm7Omt9c&+JT*>F1EI8A6)hca@>R%I-2!P=K% zNdi(MQ_8a@4Vw9~?LwCtV~b){&+B$>C!*dhIoc3AN-uaJQI}c>ISv8~pncGw^Z&Qe z2;ZKyi^i!c(Gh+d8bvrqLau{V$ShQA;DSo9jDqt;yRk9)>&MUc+3zn|-nsk9z8e1i klHR?4{pszW=wZ*^dt!X~_2BoT58v*7yov78XOCa}15HTWdjJ3c diff --git a/secrets/keys.json b/secrets/keys.json index 02ec765..7bfcb3f 100644 --- a/secrets/keys.json +++ b/secrets/keys.json @@ -7,7 +7,8 @@ "test-server": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID4ioqiTzYe6Y6H0YfFkWyDBbCB25wYs3gKNZIufE/Sn", "node0": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIITESdAzft5+WqMWM2A9Tix8BDWGnVv3z0IF8mqXwWA0", "node1": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxhznyKJwumO3jzm9kjH+lZJln7fypT8YKAdLNhVspU", - "node2": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkaqX7Omdrfa4Ot3J+k6EBUkPWp/frEYIFzS1OLc3tw" + "node2": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkaqX7Omdrfa4Ot3J+k6EBUkPWp/frEYIFzS1OLc3tw", + "node-nfs": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKv1xIg3+faoigxh6S9hUJMIPe2KP6Qb3PQtvFynkrtI" }, "secrets": { "mypassword.age": [ @@ -16,14 +17,17 @@ "servers:test-server", "servers:node0", "servers:node1", - "servers:node2" + "servers:node2", + "servers:node-nfs", + "servers:node-nfs" ], "k3stoken.age": [ "hosts:wenar-nix", "hosts:lenar", "servers:node0", "servers:node1", - "servers:node2" + "servers:node2", + "servers:node-nfs" ] } } \ No newline at end of file diff --git a/secrets/mypassword.age b/secrets/mypassword.age index 1961265135a85104efe7f3e232eb164f98b7a6e3..b48472df8db0997cd18963ac3ffc7bf9bcd96570 100644 GIT binary patch literal 1055 zcmZXSyQ}1M0EH1*yi8#!7Q&67>&kG=FRz(IK}aT(%uHUB*JP4LlF4(DnM@|{VX@Fg z6j1~lT@bajv#_&KcK3E7?AA6bC~S9a1#e+>_a8VP=bX=tf{S3kIrfJt$@g#N#|Una z!Nt2!S;iNEj}inzK}3p@t_pdWmrW(Gbew6e zfq_iKtgJM2=ZFm8>XcV)YGm+kO`}M_0YMHom15|_p?Q-g#Vnt-5EkPBJ2QELkBm|& zieA1>Msq)zZYu+Dd9`koLZ@JvCrsqw?sZKkQ z3E`yXH)&C?a)5>qWR+8MtUxqGb0u%4xRG5FRcW*HxE}I>?GvKt;h1gN1F^k-wWb8YGleuyr4p6j7bq_C2B^f#N7LOvxQ^4bhh&t%e$#3CJYwTkf< zx>(tVb;O7k?77^LjOK&gL1WA@9(t$&V8)OfbHk!MO#@=9tt~m0M2zx{owzWbSu&H1 zebYi_aXn20P~7VRF-yc#tFtKvoFlmeGK)G6yvoP9lhsBvP&Q7}p@58PLXhO)WTH}J z%(Ao4C(_2@i2Vj8*;)zLuynJV${#95g(!Qe7Uftq)z&fb&=CSO-k@H)$4n(tR4rU$IO77ONN2mHaU+@YUP$-7GQ7h|Qpme7#+wLd$VALW) zKGTbUOZoU@C9{%ZS#7g$hsnx;r%T;huY#CUhnwr)E-oN$2Y?1drF4bSEP$uiIz~Xz zL$VmbW($WkfGfQq8-0}ymehk=qgUZyhR@u$xoUcK@7<45OrKmDP4 f?VacPFD|uTe}?~AH&?H}JpJ+Z@9X=2eR=*L_F-Ck literal 835 zcmZY5NsHuU0D$2}1+`qDK|wDX=inuj`6^2%QD{hKuPjyBI+eP8NoB26YDp@o#DfT< zKfr4XUIt-67*O%#K^SmO;>8~z=t)5k1obq|x%~wX?+ep-99Pky-!=KRdS`n`v34>V zUm|s#jpG$gQ4tIqZ5BGl?u#FV;QoXC+Ww>6&9g(An5 zDX{|q%;^E_b`*dv8WvI%stc3j+QhGKYp&$QMu#M5j32*77{NB;y5UnIIzbda zlrFmmo7hgcAtk^JBP+Bw*aZlJ1T{wgJTRYs<-6e9$AAC$?DucpeEr)?$#VSEPk#h= zA55L}tw&E2f1ZEw#@XzL@y*L0oSomlwBP&p;R~PM`E^Tv^H;vPdGYf*cV9buOh0^m m)sy7CPdukO7%{`lR?`^0n4Jo*nfCKP4>