From c4a468cdc72150e228512ac02986140dc3a68155 Mon Sep 17 00:00:00 2001 From: marc Date: Sun, 10 May 2026 18:36:48 +0200 Subject: [PATCH] Added skaftafell host --- docs/hosts.org | 8 ++- hosts/skaftafell/default.nix | 61 ++++++++++++++++++ hosts/skaftafell/hardware.nix | 36 +++++++++++ hosts/skaftafell/secrets.nix | 6 ++ hosts/skaftafell/skaftafell.org | 2 + .../consul.d/agent-token-reykjavik.json.age | Bin 364 -> 364 bytes .../consul.d/agent-token-thingvellir.json.age | Bin 474 -> 474 bytes secrets/consul.d/consul-agent-ca-key.pem.age | Bin 438 -> 438 bytes secrets/consul.d/consul-agent-ca.pem.age | Bin 1510 -> 1620 bytes secrets/consul.d/gossip.json.age | 19 +++--- .../samfelag-server-thingvellir-key.pem.age | Bin 549 -> 549 bytes .../samfelag-server-thingvellir.pem.age | Bin 1303 -> 1303 bytes secrets/nomad.d/consul-token-client.json.age | Bin 505 -> 615 bytes secrets/nomad.d/consul-token-server.json.age | 12 ++-- secrets/secrets.nix | 5 +- secrets/ssh-keys/id_skaftafell.gpg | Bin 0 -> 449 bytes secrets/ssh-keys/id_skaftafell.pub | 1 + 17 files changed, 131 insertions(+), 19 deletions(-) create mode 100644 hosts/skaftafell/default.nix create mode 100644 hosts/skaftafell/hardware.nix create mode 100644 hosts/skaftafell/secrets.nix create mode 100644 hosts/skaftafell/skaftafell.org create mode 100644 secrets/ssh-keys/id_skaftafell.gpg create mode 100644 secrets/ssh-keys/id_skaftafell.pub diff --git a/docs/hosts.org b/docs/hosts.org index 1e18faf..0c3c211 100644 --- a/docs/hosts.org +++ b/docs/hosts.org @@ -1,5 +1,5 @@ #+title: Hosts -* Setting up a new vult host +* Setting up a new vultr host ** Generate a password for your host #+begin_src bash pass generate samfelag/ @@ -60,5 +60,7 @@ Host remotehost IdentityFile ~/.ssh/remotehost #+END_SRC * List of hosts -** [[file:../hosts/reykjavik/README.org][Reykjavik]] -** [[file:../hosts/kopavogur/README.org][Kopavogur]] +** [[file:../hosts/reykjavik/reykjavik.org][Reykjavik]] +** [[file:../hosts/kopavogur/kopavogur.org][Kopavogur]] +** [[file:../hosts/thingvellir/thingvellir.org][Thingvellir]] +** [[file:../hosts/quinto/quinto.org][Quinto]] diff --git a/hosts/skaftafell/default.nix b/hosts/skaftafell/default.nix new file mode 100644 index 0000000..7a759a1 --- /dev/null +++ b/hosts/skaftafell/default.nix @@ -0,0 +1,61 @@ +{ config, pkgs, lib, inputs, ... }: + +with lib; +{ + imports = [ + ./hardware.nix + ./secrets.nix + ]; + + # - Basic -------------------------------------- + + user.name = "marc"; + user.shell = pkgs.zsh; + networking = { + hostName = "skaftafell"; + firewall = { + enable = false; + # allowedUDPPorts = [ + # 53 # DNS (pihole + unbound) + # 8600 # Consul DNS + # ]; + }; + }; + + # - Bootloader --------------------------------- + + boot.loader.grub = { + enable = true; + device = "/dev/vda"; + }; + + # - Agenix --------------------------------- + + age.identityPaths = [ + "/home/marc/.ssh/id_ed25519" + ]; + + # - Modules ------------------------------------ + + samfelag.modules = { + # - Common ----------------------------------- + # See modules/common.nix for common packages installed + + # - System ----------------------------------- + system.utils.enable = true; + system.gpg.enable = true; + system.pass.enable = true; + system.ssh.enable = true; + system.sshfs.enable = true; + + # - Server ---------------------------------- + # server.vatnajokull.enable = true; + + # - Editors and development ------------------ + dev.git.userName = "marc"; + dev.git.userEmail = "marc@sastre.cat"; + + dev.docker.enable = true; + dev.docker.users = ["marc"]; + }; +} diff --git a/hosts/skaftafell/hardware.nix b/hosts/skaftafell/hardware.nix new file mode 100644 index 0000000..8d24782 --- /dev/null +++ b/hosts/skaftafell/hardware.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = [ ]; + + boot = { + initrd = { + availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; + kernelModules = [ ]; + }; + kernelModules = [ ]; + extraModulePackages = [ ]; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; + }; + + swapDevices = [ + { device = "/dev/disk/by-label/swap"; } + ]; + + networking = { + useDHCP = lib.mkDefault true; + interfaces = { + ens3.useDHCP = lib.mkDefault true; + }; + nameservers = [ "108.61.10.10" ]; + }; + + virtualisation.hypervGuest.enable = true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/hosts/skaftafell/secrets.nix b/hosts/skaftafell/secrets.nix new file mode 100644 index 0000000..36ff274 --- /dev/null +++ b/hosts/skaftafell/secrets.nix @@ -0,0 +1,6 @@ +{ ... }: + +{ + age.secrets = { + }; +} diff --git a/hosts/skaftafell/skaftafell.org b/hosts/skaftafell/skaftafell.org new file mode 100644 index 0000000..3656e6f --- /dev/null +++ b/hosts/skaftafell/skaftafell.org @@ -0,0 +1,2 @@ +* Skaftafell +Servidor a Vultr diff --git a/secrets/consul.d/agent-token-reykjavik.json.age b/secrets/consul.d/agent-token-reykjavik.json.age index bd3438bb369868c3301d4919bf8680fd4feb2ab8..899f529adb0ac17fada80d19a09f706842f7e9d1 100644 GIT binary patch delta 329 zcmV-P0k;0^0_*~iEPr%EOi@y6FH&zvK}~u$M>I8cHg#z+NkmmvcT!AYFKtImc4|{d zW_EBeQ3_HuHd$v=d3sqzVRuDOOE^hcIZ$_RLv2|?Q&3H4Filcuax`aAY)3C>NeV43 zEg)!PNoqn=aZzVDLrgYJFKcFVO-^=KD>6B1FlSpr-5<2zett(ISg* delta 329 zcmV-P0k;0^0_*~iEPrZ4SWb!$m(HcfPJbvJNxML9Dzcuz%R zMn_I}Q3^&dP)cHINH2D3ZE;UgLrijXVK{JAXi<80LRV>FN-w;mo7c_nmM_n}^@us8TOkl;5*( zXOvfma;&fpG^&q|{tikE_k~pP$JyxsVMYAvDV=y#&9UN5rPD9Ovy{b+*a08#fNjZ) zFYWJhU~XZFi9*_E4i1FNX7`hJNFCKR(dxuX9_Jo zAaiqQEoEdfH8n9gAZt!)X--ifZ)A0PIAlDhG-gtCPh@g8SXECiM`1-WW<^j_SZhmKW=l?OQBGM( zMtW*@3N0-yAW=CraBeVRX?93xbV*rRPBThVV?7#~CeMB7liL!~1>nEr zJ%Nf9GfPshhbpC+?>GsB_!&5Y((jQ)iIJ?XNc-sTS1~%N8N4rxVi3)%>=SZ4qVjr) itUePLyN6gAJiwg=Nw@0}tq0YPbN@6Dx&TwiiA>7OU8v9i delta 440 zcmV;p0Z0DY1KIYI0|9Rdq^6IAUcvW;t$QL{E5HH#Bok zaAq||Sqf`uRx)`~a4SMqcT`DkQ!zzNYkFu$d1gmPMPx{0LODc7Y+`y;K{;%2Q3@?S zAaiqQEoEdfH8n9gAZt!)X--ifSxj0^R8mNAHgjq-b})B!H-A@6X>@Tyd23W-abZVU zV`f@nN^3?iZ*^x)3S>z*LN-fAHez;DPfky7FJx3taW-msSxIg-Qfe_lO+i9cWlvQy zXjfHH3N0-yAXY0fIaqCKc}-+=OG!pTdO22CFGMdvIde@mNKi~!Wid!vW;8W8ZDcky z3MZ6zB8@V04}bstNlEIdr{`zLrcI+Jlsj0l=@n{@Q+vfA@fhdAj7WHF^m)9#`tED< z@?&zv&kw!ap9O1VTG0}eT-@G#rdhJ3-h;UNBJ7w`EUoPXcTsEIK%wj$OK#Qqs#M+( zI5S6>8D4;&wHwC}GVn7vEWC(hO8HJ_{QIAuxwW`vmN5%t{?o5aL=zg#UFky41MX%U ib`exhgt{KZ1pVlrY;K@W}V+u-jG)`+{L1i~dY-M39PiA&&F-dAQa7}V&P(pK0aZzt$RclgbLoa7za|$gj zEg)`0RA)I>VPSE1GIeG&HbppLRYze$H*!QTb~#HgI9OFmFn=?7IcZmMX*3GM9zA2g zte}5$LsRJ{&8_EAJRiw6U!p->_bBE5c8va55Pv<`d9T5Ltx8!4vAUA>Wy_#uwEA7B zBhCFaH`0-)W}D(dUKHT%n~D_zBLN{-4Ze$mti3CX%7_{$Oa+EPaQ;SViO@XCphpXf zV(A^}a0M12@E`=Ah|B3tR#43tgz`YWo;3CxO)H z_YDDL;Ay(w&1!;R?yE(`HG(rD?Hy-j8r!PG(OPEe9NgPnPe6^m=d}oTD-p#w(NX_% ydbU>tm8ioeZ_rI$?m&pG_A+AqAwD|OYru*(+&{)GbAjWlZ&45k=}>XS_H0j2K%0Z5`!(G zD2VqXsC1!ABuz*v(_lY*S;sRvy_#u8E+)BX-vvk1QY3t zriZMub;b78boaaP)yl;a_37o2zPO+O diff --git a/secrets/consul.d/consul-agent-ca.pem.age b/secrets/consul.d/consul-agent-ca.pem.age index 1c6912abf7137fbfe586b87e0009fa71237b1077..40e1a6a250640eb448e8d27236e51fefb1e42a55 100644 GIT binary patch delta 1575 zcmV+?2H5%L3)BpdEPp{xVoGOpG<) zb9OOUQ3^6bWGgaeQ(;F~Wmro`N=9~JWlUpQZC5a1aX2eDK`U=TR!DPML{us zQfgv&IB{$%Z*XfwD|Jv)WNJxlS8YW!LuquRdGvlG&EsyGIDcIQ$}NLIY?(~FGE#vLrYV5LuNNIXGAYjSvU$;-|~gS z7AtIj&2}vKD#w!!VD8(VV`;=e7Q6<-at0J(rzCVh$`X+_T8s^9Ny?}AQUqugEuX4` zRk9sXJgu0ah}z;yuuWGf0#UD1%3$-;ltQp7ew>Jw$zZM0{}(J#?><#uW}l4r%)$w? za4P3wk@#(S-`I$a{?!svA=2r%80k#vO-M3-#-3-8@0)BadB7a|UD!WLxD*>r7oXCr z?rq^&I@vbOy|W?!Dy8ohk_$QHwW=xf-z}<_OJRuH)}IknM!hmL0-n%_57;+<$LJ$@ zBI=t5iSb%RmrsM*pCP7^H#bRG^384D&)bNZ-mfz`Jvko)3F~Jsa4@;5i&|CTSC%1v znOYzB2e}%}T-QdQu-AM8K}zm9{A~y697_Gb2Y%5-k|`Nl+;4Q~Gy&mUrf6hNqToVk z@5gI#zwWcBP+FqEphZyW-8JrlC8K$%ig!gnPeq^G2y}*jk-2gs@HN&pAM_2izpPVwtu(O9?~v?49&MkS zmV89!K{d52a!&s1F8MofP*cSBcnT8)(soAy6&uv3bElTB?p$|x@wsZ|?cbkDIIBuy zXidHT5NE+pZj7c=(#PAEqB2|R0H%z#@9USbl2(g|Q>hoI1m$5)iIVAsy|$l!@dTap zJFbzbw30)fbOECc(o|Qp*Nh(3%72cWICDq%{A+fR6alAvIuouRaF%pYD3nRC>oMiH zfpX`KP^yx|m*GFC$;0M&#FE^~*6~ zTnhFz2aTEyAV{#@9r|BWQem2%vA*wvHQub02Bv5ED!VD=;d^7Hi0w`Jjd)r|`Xz5; ZU{*4fugRcTSYA;p7&-5TC~Dj_*?nSry($0z delta 1464 zcmV;p1xNbS4CV`vEPpUcGfH(dHZVm=D>5^9F=j_-VmW13ZERRXaYQE+T-D@{!} zR7+=RK?+K4LuY4lc26)va!E)^ZB=b}GHh9PVQz71L~?U0MNCgMH)vHuF>7&4a|$g! zAaiqQEoEdfH8n9gAbMz4M@V-dPBKX^Pe^c5HA-f2LtRqZfZp`RccmdZfs~dST|!YR!MPUOLTWKQFLTa zNKi9Pk?|LQMl)$`QAsjydPq<+acy#XIbnHgdRk;^Z)R37VOn%EZ&6xrWm9WZFhNBM zQF(f6R%|wKRyS2EGc#*aH+on}T55DeG;M8nL}O_;d2f0*FnUvGQf*ZVEiEk|Qf*Kx zaA8btOK@goO>|RAY;sRgX;xHAS4TNXb#qvAGFWYYH(_;cS9DM~3Tng7jIY%WH7*cA z(Qpp3L#_JW>7mwy{0NvnkN6QjJ3tku_xqA;kkFe9Qw{-!A|ze|aJqiEkYmKCBZ~!B zq=;O|3ASsGR&dJ0{OGYxN*4M@?%E$HK5QKi;9iu+RvKNiLV``gM(75LDM#JofJ?$& z{GHN&#*bChWER=0v=x*31J9HlF4PdPqKbXD;2ZZH2EvQ2!%^ROxuGA_lAoo`>&yF% zsPIRu5n)TsO6%?E|1j@tzB0(Ld3NO~3~pOoc=g@Q3%c{NoBB;t75R`-T{q7?Ay$AY zj`<^KL1LRd)N8I?N%xX)?AH|vvIK>{xQ73K>|{*hI6`QLHQVF>ndrING&%wz(6jK! zI&qfwq%kfiAdh$DbOnwQ-o0R`)NIk`Y{cP!&$gIAc)NaLj-Ij7Z6&A$dCajs|G=ky zkZ2m#48eLh^-a5XM&~+&5{ z1eYaCX8#mvFRfX>D{y1U&X(K?53=8F3UKw7-QmV;fuF2JyBx{cDQie4Tp2Xpm6{amSc$@)`YC`K>k1Y+oQ@b zQCf*0XyS&4?ne;}@>a)h@|cFuc!NwOn6CjrNf>}aNZ}{J`v2zlV5Y@-3xm$;MVi6* z`2iSRN`=1Q=c;cYI++fT8QjHxH_5su{pvU(c~Z-itZvZ_`iZ$(;f9m+g&JcxoLgR( zvp=_!3>p~j#V{^=&@yJ1Ysk!4w)gR$-6#*$<1o1FB}ozW{^X^-*8p;HOq;~COkY^c z9kq5VPa>dK`eUPrpPsxCvo2+7(8^v0@SV-N23h~f(xbHW>BNA)CP1-&c)BA>+2E`~ zYuXN=YJ46uiB~(Qa#}r>6CJ?%*#n2KFB%+zmFXynMO!SFwkPE=CArD+1Q`M!Kej_* zT+m*Jl^AN|$;Y5L?i_zOq=cp!sK+Rr7e_JDM3V4~$yGAnj&Wj%QW&|`y6z`(H*IiW zTg}t6s$3^4ns2%1w9Uk4^(gM}^k*bN%|1L>aoXUE<2N01X5q3`P?)-fhW8t&Yi;fU z71UB`OF%c36dM|FXt*Uc!tT{%6GCO##*Wu5IQXb%Qiyhk9LN5!)2-t*-jYp4oIi$l S;)Rk46iItSta~Qat6B`rgQ*Ar diff --git a/secrets/consul.d/gossip.json.age b/secrets/consul.d/gossip.json.age index b7f0ecd..82fbe35 100644 --- a/secrets/consul.d/gossip.json.age +++ b/secrets/consul.d/gossip.json.age @@ -1,10 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 GWuf0Q HU052z43DHXbPh4m0Cn8YWEabVMdT9Ab9ZvnRTkiGiM -jsGBcbgj1JeYBdvnRqKT310VnWqZmRYIE+LbkPVmDxs --> ssh-ed25519 zhVGHw 1oy7y5z6KQy+JYRIPyqfeCgJUbGWdo77NiGnVRA0QRk -qNrRnats5cFFv8K3YUtUXdSwhWkgcBGTeDlhWTkrNRM --> ssh-ed25519 kNjiNQ IWfsJxXu1Kg6Z5p1qNBopU0RkYt7/s6jw/DJDQXpTHc -ouzaIxV7Y+pE8t/8s4Vk/AO/MccUpgHGhn1cq6C+E08 ---- LL3bXyeMTogvYXqjhwL75j64P9bNIFG2pwFanjOYm2o -)>F=!vE`e*mOgJ+CT -w+tΫp[^8kRY_= 8xg! \ No newline at end of file +-> ssh-ed25519 GWuf0Q bW+hxNOISsRCrRS0OOIAPPju119EgOotwZ6niLAFzkw +lz23ChdAIsATg/mKc91fNLlGGJ9NFUt9uNYq0cHJPk0 +-> ssh-ed25519 zhVGHw v4g1bMvVf9kB61WkvkyI1mucwtHrml9Fe8Byya+dcUQ +ag6FoKKpdEwB3rW2zYAoOp66J2dgpp1GFA50qpXUSqg +-> ssh-ed25519 kNjiNQ MUk4rt+iiLSapgtAwip2W482ElclcU/TEY++ZRftEj4 +rSp4fJxuyfVy62NcE458e9KB28c5vfLUiH/j8Lfpg3g +-> ssh-ed25519 W0CP4A O25wWVlFCtMYyWwyc0vgHzVyFQWzjwDGbkewVsHZ5Wg +yEatTfY8VwvAviaXYQKKDIz/ergEoMIjNa0MnUZ5tmY +--- 4is/3sp6dIeifbWEOrhsHd9Ff7lnRXHvMJPN/PDzJs4 +8Jj] r}6 a##wP%_tb?$ x9>5yasl(w- DJJKFrp}s0* \ No newline at end of file diff --git a/secrets/consul.d/samfelag-server-thingvellir-key.pem.age b/secrets/consul.d/samfelag-server-thingvellir-key.pem.age index f1db35142e93ebba0332c8b850abbd8691f079c9..ec91e687066ee07ca08abf12f5b329e944c7e99b 100644 GIT binary patch delta 515 zcmV+e0{s1@1f>L!EPq!pS!_~hbZS#ET1YlTX>UYBH*zaecQJ5GI951HaadPMc2G)G zPb)8ZX9`D2dURH1V`)KSZ&74rZDD9~P*qMVR8l!hVQxi4aYiz8PBbr8Zgy})MG7rG zAaiqQEoEdfH8n9gAZt!)X--ifMM+S0PEKb{IdghZLrXYwVSg}WX+u+VWN|??D`RX} zcvn|$Q)f>~I89bG3N}<@P)b-$ab_}5Hb+BlIc7vqbxtr(Zdfu#RC!KrFi&P@YiDmO zN^E6G3N0-yAaXEdZ&zYAHd8@GX-{iNHFQi*Wi&%-L2OP}NOwY2YE3yYS2j&;LvTV_ z3h1x-Tcc!%sDI8DgtGR0UhVM`!+=!=hQ!Mb*<0YChT4x3FECfe2{a*}3j`FvQ7r=V zbo>O$Znw1zFWb7V_84KPo1%QN$-N>CZC+v-2-w(11tsOc+6b{;5R5|h80g#v0M{dxW!;xx+nmQ~ zuR@bMh7M~n`SZj0LcJ#L!EPpdFLoaGEX-Y#kZDdtLYPijV0 zG%s3sL2^iBR!&4&3Q{IQHcn+YGI4rgD^Pk;cuZz6K~!aLPIGlxN@+J|VPkJW z3PBZ!FA(IWMt^-B)A#--TFlCui$Nf$6fR=q4dP=uGg&a9;F&KhT=lk~Yk#qS)qEQl z$3U_PpjjQ~*U)R^33lGlv`-IM6~7O{91S^iyeDkYT8s{YE~fJYO$!AlyK1`r=KOFF zl6d<{w(;EEKDn~egjlk86iEvHZ(vit=TNh#6`Nn&qI{>xr{HU~cayzmNS4WjOKQq0 zmZ5PGI=e&8Bi=9uP^NXF6nKNE%jtVFr7VkAxB+Xq`AB&yvDXVhpO}+_LQ`JxaDZXQ z(wO2KhA=A7=ljE1)jYU1hD2-duGY=I+q!Ub@b#X)(LLHJf$apmDl~^3F-L*i;@g9} FK7kNm)lL8a diff --git a/secrets/consul.d/samfelag-server-thingvellir.pem.age b/secrets/consul.d/samfelag-server-thingvellir.pem.age index 64d3d6fe80aabf5679fb7b881d6f792637a467f3..3e1226fe94f3b5c14e79c58f6cf8d83d935b69e9 100644 GIT binary patch delta 1275 zcmV)mNGjnG*Sx7K;a85RD zW@&3kZwg9!MRQ3(Nn}PxRd-HsOIB=7H&RDyS~NLnVM2CEK{zvdLv43SI8IDYNeV4K zAaiqQEoEdfH8n9gAZt!)X--ifPHkmGbw*?{N_KTuOfp1adVfk}L~?poQf)C%Ojdd^ zPI^mBFmW?uXGd;#3OPnGNHbY>OjLS7VQMo|LS;f_XE<!$zzFJP(eQ(^N<0T!!P^pvd0;(N4zVb8{R^D z@Zjsc8S}Fy@%gtnN?JD}_gD3%WylmAq5FNHRyB(##yA|5N@6_&hpg*+=6FTiiB9Ls zs8EqaymF>!eIE7Q*nDPvZXVv}`tK3+DjpSmCVS*2K7Rr2HO;Nbmn2HZWgxc0rWJ)% zJ1W|@12xL(sqv+?atAq;27So$xW$C-o_MXT5*5=@$n+}Wka)2LJEq`jmoFj_80P=F z%|ww3!g+}!yAUsm-V92vX@cc0C3QZHJsx)*_Gv3Bs>qs1|6%Avm^CMM}^v5jT}YSvp6#`+u|sO!8W+eq~9idN@ywn)_3{9(~Q=_j>$rO}C$cl7AUs4kol#s=QI{weE&_W0;QEpyvq9 zj)1yhw?tt4X1TAe79F*y?m>xDldlp@M_8kSih!_ z^ndV69|gugcNMu38QbL|^l-#vN%kEWV3y+8zs!J`I~>F2y8RC&kD{|vj{`D01Y_*Z z9S6^JrVG!NEHQ8OLUiY(mvh)W7-p2+nT^(J9XldEE>q!@A09W#u!-2rb{}KjzCV+d z$L_)Dy$yBE$nXq$PAcdv>b)ZmUx@Q42!BIA^&tlPn9juA^hL#lGP92`2=4C?cYRI& zQck?YDkY*EyKE%!J9Lp8=*ky>skKCVK!#ql1gDd-U#97`)dvF?lXHEtg^6slE=b}N zLDx-F?h(xxn!zzMwEL%PtNQl~cJM(1I%fv6WBB4-pK^69X&nXLp_zm6UztRE3!(l{Q0{fB+-QT+P2%|Ok6Ij6RC lAvOHdVwh;c{O!6 zdTUu%LNsz%M07}F3NmsqMm1wJcW6myPHI9cR8C`INKsfhWlu9hX*M!XbTCV7Q&o91 zVRb`A3N0-yAYm^=H+WEJc6n|~ac@d=NKZ3uNn=`1M{q=FcVu!hT5Ly6Sx{njYh-0K z3e3Brmw5rV2Y7^R0#cIc)D!Dj zq7sRFZm0aIFk#19SfVS{L$^3AyI@rBr!jqnRFt^SoPV$6hiVTzB_cz_jX>H-1Lq$f zovQV<#E+3xL~a#)3CtAi#RAEV4;*3kL&CwLV{1mv=6E0ct+mZYNMMEY(L+4cbH#3) z3O+Z@w5ogRTq2f)Kukx|gZRs|Nyj>cc>udNS2w+L#x&6t5;%P}Asz!Xvd*G=QeKb* z5zv{rAAhhe6n0A-Ht`_$X9lhVUB3dGO&@0f_m%~+Rk8EG*#hiN#N26XZ|@06hXmd= zK0(GpP~P640-ux{ht6_(WMn!@Mw*3hi6xw3E)VPOmNCd?jxogG&oGc;4FdH6k@DZ8 ziD7~ghrZ1j0xkUIVt$|hz$viP)zhh9DV9sVJiRo7fa}41 zTEafArGSv$`Dy&GcUYB!!!N-pjJ9@CDIV`Mhh-Ktvnop*UXl_plJy}DL;ZD)6J-u7 z?|)GzuO9~dIDj33z2zwh9z|7`TS*C=KbGyi7KIuAGD_xFf(V(QlfvoLW#{|ENesO2 zH)^JVw!1xyLBl-`4I?s*MurcnGTAHh1vKV+toBRA{7F8?>|O$5(CXJ?JGefsy{&}* z%G%v@vQ7PQy~IK@PG5!G7R|BI#XSU+1b;!TGSDl6a5@w@M(|eup}Rf6r=i3XE7nod z5@;;$X*IlgF|mB0%&A}`v4U0gVGXY}oW0kDzjqKEbQADHoz36v7|L+QpG(Z&K#+EaLT1OFaHF$yF$K}sq3UaI4+}JbRP=4+C4fSOC?m#q2%m7> zgo3gqJO|2pQoTq*@k2kVh`wU{$8_r+J-Ash`3cV$6=!*Mh+!(1_`o;bGh(Mmv_$n@ zQfZRF_4HqNQal}s9pJ_uR8HS1-S5VF?X}*Zn!T_Z+L}9~N^q+&F^eV1btxDVat8a_ l*Y^_3F@}4(QW~enx^Kbd$DmAJ-rNK@D0I0BIj4k?&G@76ObP%1 diff --git a/secrets/nomad.d/consul-token-client.json.age b/secrets/nomad.d/consul-token-client.json.age index 8795ea42ced3f981c7259bfacb3735028a454dab..4e0d7716dcba4a70a6de64670c166341e54615bc 100644 GIT binary patch literal 615 zcmZ9_yNlCs003aY$qXt7PI8cQQbO!6Npo!!PMb7In=~(zrimb4n%5<5(?{AQjk~jQ z$PFhhikpMra0sFZa^fNm%ALEQi{PM$2)f_*4}4DOqkiJfmXmojPA-mTVI{*LbOTP) zE!6jLlEf&O?=1qL!9{JIZ3m&WXfEcNIWDMyhF*3VCy)lp`HLqm{B*_dLqs$%=70k?VgGQDOgG?>j zKDrI$IFdEkDW)Az7NRBdjdbZ3?TGMs&h&U^($HHZCG>3{m#yV zpZo9K=-##M%A-@azkl6ZJ%L~S_VC<0ysefs0m m{V#jF+bcK29b(P9a^dynvEHp*xiLJu@hUt1`R)1r=l=n!U(=NU delta 450 zcmV;z0X_cb1o;DyEPp~uHES_AOmIwQYIiG5Hb`k!M0qPgdUnuAR%>ZZbxmnVL`pJHHZXZsX;CwCNqBgA zYBWJ-k?|ORZ!}1AQ#fU6QbbHoMMzdtPb+s=Hgr!nIYxSHcv4tQIdxNKdO=}TXjuww zN=Y$ANNspmPepc2c6cymN=JT8_G8!!w&eR|!^WKvY;9lNZ?L sa6iT?@Y>tvGfe+%#dtY7$Knk!mHoeFSIW;BOXnnhDqKBnt?S&bLpfxmwg3PC diff --git a/secrets/nomad.d/consul-token-server.json.age b/secrets/nomad.d/consul-token-server.json.age index 08a7bbf..9ceaf94 100644 --- a/secrets/nomad.d/consul-token-server.json.age +++ b/secrets/nomad.d/consul-token-server.json.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 GWuf0Q GSvUmcsNXSkoVOD8V/UP+KAGfKX4REahFDmwlROkoSw -ruTijdplgtQZP3wjnNGemh3a0omKK95xsfXzkWce0lM --> ssh-ed25519 kNjiNQ zT/ticPDHAujEWqSUrPaGsgPBdbaLvLQ/RSMz5C0aW8 -JTy+b/N6yjfPtrhYXkFWb26PGa+b/M1DVKeGsW2oimg ---- TKdmCeaBKPBBIkKvUqqqQz9DQigRuLRT2ZFto7Jtqr0 -W3Lj䯕'HgRs;wۑցt{E"v17%&({˝E.3SzNcVҷlˆfWu5d2  \ No newline at end of file +-> ssh-ed25519 GWuf0Q Iz+zbIXV2o+GBZCHEv6YWi+JjaQuU4T+g21TVPrQr1c +op3yyGCAU+GQtm0k+gbq/yUvHDXmWcTMc4kRi7O7x+s +-> ssh-ed25519 kNjiNQ EATD3QCgsJQU+K0JG1vRxzO3DhYme+KodKaTWopeNVk +mM9A5+jdhB0Qkx/7uR/3Vs7YnzjZ2qgTKedHDxWtolU +--- SGjf+G9rCCrDr6oqk58hkiP5o+BQpZ1RrxmC/r0soz8 + !#YCPpRIn%v~pԸFOKjdAڃ7 jy@P<(Jpa$(AZMbj \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index fe0de82..db3259a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,7 +2,8 @@ let id-reykjavik = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFwwpKfxNmUyBoPZqz1jYc6arCdHPvJrEsBN49m/P3By"; id-hvannadal = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICy1ocZywBvFHpIj+FvaC7QspRWuLXjy6fwakq9t+0Ev"; id-thingvellir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEIvWEwYayFK8iRb4g2+cnQXlqiMBu3aWxTahXkaCNG7"; - id-quinto = " ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxgIT2+aoP+ZLMPupV8M0UwCLX6A3s+H6z3BJPCjJc0"; + id-quinto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxgIT2+aoP+ZLMPupV8M0UwCLX6A3s+H6z3BJPCjJc0"; + id-skaftafell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINA2DjHGlJOComWzUzbr/vdT74r7VBJLkmekn8b6783q"; # --- Host lists --- # Since we want to be able to manage/edit all secrets from reykjavik, we create helper lists that @@ -10,11 +11,13 @@ let reykjavik = [id-reykjavik]; thingvellir = [id-reykjavik id-thingvellir]; quinto = [id-reykjavik id-quinto]; + skaftafell = [id-reykjavik id-skaftafell]; samfelag-hosts = [ id-reykjavik id-hvannadal id-thingvellir + id-skaftafell ]; in { diff --git a/secrets/ssh-keys/id_skaftafell.gpg b/secrets/ssh-keys/id_skaftafell.gpg new file mode 100644 index 0000000000000000000000000000000000000000..9201f271dbf5461a634e798e9a1011d291e6bace GIT binary patch literal 449 zcmV;y0Y3hOUIRi%8(({=gohFV2S6jgzp(Okm#n_YrCLeR!*=eqSI&qEvJ6Gm(DF0u zJOeOVn#$lq7^h2exb#+DtK)BH% zkS@{TO?tbJGPJezL%Yif#tfVBI{}{Z3u?s5jQ8r2Ad*X;QKzHDTi=&VO-N%MS?6NG zRR82J$@f%H`)6x~gNU_S?`Q)&?to6C)=;wWF0=quJQh_U3JZ>Spll)ftgtsT-?TWO z+urdh>yEc|CTXyNDNj%%J{t+