From d7d316bddbaddc48185cbc3df039a59e689b4136 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 5 May 2023 18:10:08 +0200 Subject: [PATCH] dumpyourvms: mnx: cat: move to user teutat3s --- hosts/dumpyourvms/dumpyourvms.nix | 10 ----- modules/crypto/default.nix | 1 - modules/devops/default.nix | 2 + secrets/cat-testenv.ovpn.age | Bin 0 -> 5611 bytes secrets/fwknoprc.age | Bin 0 -> 748 bytes secrets/secrets.nix | 2 + users/teutat3s/concepts-and-training.nix | 48 +++++++++++++++++++++++ users/teutat3s/home.nix | 2 + users/teutat3s/mnx.nix | 18 +++++++++ 9 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 secrets/cat-testenv.ovpn.age create mode 100644 secrets/fwknoprc.age create mode 100644 users/teutat3s/concepts-and-training.nix create mode 100644 users/teutat3s/mnx.nix diff --git a/hosts/dumpyourvms/dumpyourvms.nix b/hosts/dumpyourvms/dumpyourvms.nix index 3b1e4ab3..17b7597f 100644 --- a/hosts/dumpyourvms/dumpyourvms.nix +++ b/hosts/dumpyourvms/dumpyourvms.nix @@ -71,21 +71,11 @@ in { services.mozillavpn.enable = true; networking = import ./networking.nix; services.tailscale.enable = true; - services.openvpn.servers = { - catVPN = {config = ''config /home/teutat3s/.local/share/openvpn/catVPN.conf '';}; - }; security.pki.certificateFiles = [./consul-agent-ca.pem]; services.unbound = import ./unbound.nix; - environment = { - systemPackages = with pkgs; [ - networkmanager-fortisslvpn - openfortivpn - ]; - }; - # Set default brightness to 50% # https://ubuntuforums.org/showthread.php?t=2409856 services.cron.systemCronJobs = [ diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix index 9b4a91e5..8dad1d70 100644 --- a/modules/crypto/default.nix +++ b/modules/crypto/default.nix @@ -39,7 +39,6 @@ in { libsecret qMasterPassword restic - fwknop ]; }; }; diff --git a/modules/devops/default.nix b/modules/devops/default.nix index 0212ce43..0f966ddd 100644 --- a/modules/devops/default.nix +++ b/modules/devops/default.nix @@ -16,6 +16,8 @@ in { home-manager = with pkgs; pkgs.lib.setAttrByPath ["users" psCfg.user.name] { home.packages = [ + fwknop + croc drone-cli nmap pgcli diff --git a/secrets/cat-testenv.ovpn.age b/secrets/cat-testenv.ovpn.age new file mode 100644 index 0000000000000000000000000000000000000000..3de814e2778e111b69dc81dd99fd6b907e00530d GIT binary patch literal 5611 zcmVk%NKjZ%PBCz2b~#8jW;Sz3GI?w^Ls<$@FH=M`FiJ&3 zVM1vyF?u&EY(!d6SaV4)Lr7M2ZBQ>uN?Kt-NkVvIaajs2J|J^*Xf0)AGBq_ZIUqPy zF)MCoAZTzlNJ?5|R&7;nS50+9IdO1mSu0~}VNhgIaB+1sD>FznXf#B5O;&j{3TAjk zD|KpND_BQ2YcEuGGEOi!bxlKhcWZKCb1_p>I8IS&F)w;jQe!k(3N1b$b8~1dWn?ln zH8D9LLRNEmR6!tkZ&`CzD|v7?YdBbPRby>;NKa^WN=r#=GI%mERYOHpXL3e%HF{xJ zNJR=kdPiwPa7;!`HcnbIbZ0eWWo2Y$cXCNZVrp73GeJ*kM>a@eL{&IPad!$WJ|J*u zb}eu+H8vo4M|ydBcOXG)XmCPkSZZu5a%po!L3VI$MmBM5VoXd}OKf#CX>&tlQe`=0 zNp^BGOJxcxD|2B}P*P7yGh%sERY_M)K`T{yWHUr|YA-@`b!K!?NKZIxGDb^hPc&C^ZAC*idNXG@Lu)HqR#gf#N-M?x@7SWkE|Ni;bMEiEk|T24zhD{^-+ZdYPUK{0Pqc4aX%Z$fcJb9z;B zYBfejHBu`}FnW4uQfPMy&rQqYaZgnvBIeTXcKqNugSibe=dOLDH~I%3!_GzvK*FVcR-BZa)byps z&x9!ekSQZ0lc?*m(`=%3g$2DbIL@K-I(|6nQqfOpDn z){0GL(6jr@4<67^C!@SYnCGNrxCO*Q_nMjdK2z#9quEgXkd|yqjlQdxXov~oAn-1L zZ>!1EDAK~>Eusu>*#pPP54ST8bcFyC0{LS6?uw40w2trK)+YuDNF*HppFt8c4PxCV zyc;h>T}k*}tSGWRTv8CG45u-`&S;&CByRcCI}8Zx#kx&4{_l1SHmSv*OT8#LGvxS5 z_;^+)|5nb(&7HBcpd(#<*nGEla9;jkX-6Q_FR6DqO7mO~C&12@sKgK_6wl9$IsAg znJaJxuT-Cun9QwQAg5et8`nRUxI~Z1>PhDmf06esT;CN7Gb5RDMuR+}@CiF@w|(B8 zrPh&bPol9Ki1`a2_u0zgN!NN)lQE6s*?0V1)xjc}eYJvgI>4U~Ms&LrjMddwc1Ghi z_zlFRa>0uy`(rY_T$BN(r+a<& z-)>Pvgce0x@uDK_n0{qVlkw8kF4Idtu>HRrN?^s^Yc>FRAXf4&NF#Vxf6VF8%ew^& z`OcgLi1%z3as8|FKu^Y2n8A6xcf8JkYK+0u8ddKtMZlrwjTPtWG}N9H-?=2@^;3GX zokF;RAm^CslF3Xlb;j3`RHBd*3is%}ijOp<#DQMs>BP9 zJwmH?ZzDZ2RN=Y-MhbiB{|5m30Z+lhLl9D$j9}*67ntcwn0KSNCCCjkHN&Ph&M04+ z|8@(5g%pT4*)IC2^jhH~m{ktG?j>I>Pd?w~7Vl#uszYkd^qw+RCaXec2xrDQLF3Ow z0W|^S!z?u|9^1mtigxYuq~?MwnIpcO{KatyIiGm7OdW!sP1V*exIl`4;v9<3&X#8{ zD`;cZ^A~|{9uX?59`a&2t`smVLw2Ybe-AxrksfQ1nw-S)s3PBDY;8h{w%2vR^SW9#uyM-rmM9=t(CyjiIE>jsqTL+tnD3 zR(0<}X4{U(uYE_-6hCDz4$0hME0mbD`DFE6ehXbL5-)kARl!Ut1= zBeUE=GL8OeT$8KfR8bId&!=(f8z@;AjRvzFPoFbwaeVu=Eo(yLmjlo9n*J`SuaC$8 zv1Xt*NbUGv+qvhBkD_MT0hh;@9d{kF4SG+tUABlb{}KTHSf@E-t(|eN^j-ZNP&fzbcCvZ> z9ZG`+8}~QK=Ypy%trk$T)G2Sp_niX(!a9X_Moe9WEBrPxla7hC*NoNVvrvc;yh*Mi zS~Pw73o~sWCQM+3b{Kt5lmEfaSd(;bkZ%8Eif#wL>A_$aQ~il9Jc-r#kexg7bffLs|on@$9>E&N1VnlV4u4Q5$FF}pF?3etO94Aia`T2#yp0T zSprO;XJXP%75ux}qrP1Kzw1FAw0b~ZIvzkhfit-dcp7ju67OD|P>zQrFe&f~<*`n4 z5%_E88Vq_D{94twbG}OzTQ%HfiBS$bF#GKvwo!{blr+;9Sqclb;))p1(Ok1JVun`Z0w3@NoNkqhar+jOsisC1j#cPN*ph zbd{bZDz(=pit*f6a0Aw6A#X+*iqQkM%MbWMZObwuJ7E`w9;K$O-K&f~y6#1|BqmhU`s_KaO zcVm;z*3(6ATubDF#;yL3aSW~GdOeV_QL0K#bAdH;nqIp(N(S(0AUi!QYPCR)k9_x5 zkoEEts{!!24dOQf>9hu?X>G4<8Q?R?1<`&?Bv~1%#$EwRp0@*p@6GgNY@2r514Vck zeMhkby&f@yDZr&uq6iEt+!Vf%7$w;t|t$-}pltxQIz1 zE7zfd)c<0!748Ck1tUee5)F|Em{>FY%E0v3E*_upVbqe&P*6 zHyo#F$MQ(q`x4v_sy^H?~b+Lt0GRK4UxY&-gMv#^c49eMv@k z-fcm>n?QZzb_nZ*3(wD=mi|sxL&Hc- zh%Y(t+oJ|SzFWsHC?l?*EaIGP=Cd{Lw1vH=-`hBqV!Lm>csQE6OT`5Z7o!@&EWiEN zy^>4&78EnMRHtGDL)`b)_jc0xn%l$c{F=9 zxS$>KW{C78eG82h(*Y>C;%A~`7?X6qO-;1{z-HUSm83s;Pcex$IvztG-B%joSd9;M z6!jv#DogP=N+C7gK*NxCGPGLfH?m!~tzl|B$29ltLe(SI*bhyH9T?XFsijOo zNN{b{qZFpIEawVSKUMZLiQFzM(U(oPWm9jiIPVuaSv-Jzc4fnRb{5R`koBNtonoMY zcTH`I*`KsYxjE5F%f~-Yseo(;76$%GCh2q-X`}*A$5}g_ zZBQLE=L@{FdioZcA`FMhYqg*RTF5z8JDg?tUqC~g&S_>Qi3J`J3_|ol`<_2UD7UUS zcHVLYMgf{uk@`>%h=I6)R$2UiM5{z9O0g-oOTxXC?@=e)gL0vi^hz)~xMVL=3#F*T zk&@5{WMctsl_`7GyEN0Fv)#L{@ytdC^bJL|bmS(fq?Z6pUcJ15brM}a%=oo`sdCv23p zXTD<1RSuy@LWscmz9i1#ZIz8l7Q^km@QWwJ-V;vDG6e|d9JG`%{*m;ofvOppO`9UCZ2cstS-w0QwBW?j3#a4UclZg^J zNk#YU2~8wi^MqsLD(P17xXs|*ZzDXmWLA#4ma`W{XK$YXAj7gXZCefSBq`zr|Fh%K z8YY6IQrOcIvO>Me7XU-$=%3w8P+A<; zciFzXx)RG>6|Ixg5@O2>095KY>gP||)LM#V8NGHP!ofOUlFED)^9OXa`G4EqJ?ZnIQX*+5*F@Oy`Pv(l zaL~C+YlOIiUUBI`xDPb4WJ&557p**J;Y?F}GGNWgc=Z=3dg9)%#F009IsaZS|ya;k&4c#N{OEL`pM$J;UQR0 z5_X-BB=)xRj=D9Gq@uMk3f^WyEWUL{mKXrNkCr@<^VpJwqXPJKk&%&gT@kKLo6v< z9PLlV`CNP&JX5mbs()jN zS~io*9_l{Uk@dm8xFwK6P3Z-%_&Pr{3S9+98<--QR5o$&koe;bwY^=cs&l7_?d zZmA-~nF@cCtr=x|>OH+BP7f`Bn_cqiyXrs9?N86Ig|GaX!_caZvt$aFBwbeS5dI(j zL^=H+kR3dZzVbPphai{$;;oXb<25jencjHqV~#DC6-0Zs!74_2S%v!KO(6lnuDq8#x*=abKh5<-Oyuoc)B<2{y(|L$?JmHYd=j zZ+^xIP>G_3bpd2~j?X~Q3HPTOxfI6*PJQ%6zQL1;8AzJ1J#B4Z69_Rh~R zK=H8}WmDF8Q7#ODDxQA~^|5J!w7@lohPa#f$} z;-Xm@9y>cAMg*Buf(&6Dbwa;>PltIX(f=z5v{e@@y41(gIDO^oI0YOioy7J~+&f>1 zO<`z*6}SXNgoN80^;CPohh9nb5uP;-J_q!S>eQ#nLV*_vu%Z$OWXs%KcAm6%eC`yc zcl~?}C(~PQ1q0vrFyaDEzkStP_l_-RQw+HGATty0yKpxuJWnC%ot4d2xf>ISKw{-v zwOXYf>}JOJ-ROL*1lX8LY#pk?p)UnvNe~+e%m3iiX4s7qSfStz<&=#o%<+MbIOP** zu$WHn-Nx*|ydTm}a3RNJuO%}EQOqnKBvQ#S9T3d%@F~;hELEtySE{g9fb2fuTyvo? zJ71(;9wY<%o0=!^>Al5bHMW*|-qy9zjy@uMeo^6**QL!w)m=?yaEukZ>~W%wT1CeY z;>FrTX4KKyR_8BT><*zmB&z7jKnZ(HqiMdE8oXV6NZC$7hasI_wY*5c6c!TDO7>tj zXjGVC@Z(f1 z1oNoRh>e)zeTiw>xC8xm-_d5&>`m(ahBuK3y9_c*F+elz6I-1xEqY9e@xDY-;JlZb+% z;1JxHA`Vo1fCn#vFch64Loeb%6fb&kAmYJ`o_w%_+jW1zkB?8*wXkL?J>Pa3mN{Yd zbjXc{!Y6=!-w10ejH1yLAlQ%yF@V7&SVxh1rd{u90@qcE7Fo))@*dr3Ci1G6ZpC{g zlxC_d7D^~sJ5s@gBu`@ok0Jw?EwcCzV$OLwBlylyB#ns%sLw#Yf^rF%~kML<}|N%0X1At14_@R(V!!LVO(d zNKNj;I)iFZWH`r>`gRTH`+gMz(nVdW)4u1`+X_k$SyFLgRUT?VISS>PLK5Z)uG_Ch zgIXjc_d(ril1M?zW3pJ&0&3`ic+V7NKkIeOjK`5OR>5P0Io#6hh8wnFG!A%V;0Hqh zYa?325ohs^tUHpc4!K%|u_Anlkh6u9%Am2hOXwEM#^eMn literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2332bb39..044bd9da 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -12,6 +12,8 @@ let in { "example-secret.age".publicKeys = allKeys; "environment-secrets.age".publicKeys = allKeys; + "fwknoprc.age".publicKeys = allKeys; + "cat-testenv.ovpn.age".publicKeys = allKeys; "docker-ci-runner-secrets.age".publicKeys = allKeys; "test-secret.age".publicKeys = [users.teutat3s-5-nfc]; } diff --git a/users/teutat3s/concepts-and-training.nix b/users/teutat3s/concepts-and-training.nix new file mode 100644 index 00000000..a12d355b --- /dev/null +++ b/users/teutat3s/concepts-and-training.nix @@ -0,0 +1,48 @@ +{ + config, + pkgs, + lib, + self, + ... +}: +with lib; let + psCfg = config.pub-solar; + xdg = config.home-manager.users."${psCfg.user.name}".xdg; +in { + age.secrets."cat-testenv.ovpn" = { + file = "${self}/secrets/cat-testenv.ovpn.age"; + mode = "600"; + owner = psCfg.user.name; + }; + + age.secrets."fwknoprc" = { + file = "${self}/secrets/fwknoprc.age"; + path = "${config.users.users."${psCfg.user.name}".home}/.fwknoprc"; + mode = "600"; + owner = psCfg.user.name; + }; + + services.openvpn.servers = { + catVPN = { + config = ''config ${config.age.secrets."cat-testenv.ovpn".path}''; + autoStart = false; + }; + }; + + #home-manager = pkgs.lib.setAttrByPath ["users" psCfg.user.name] { + # programs.ssh = { + # matchBlocks = { + # "salt.base.test" = { + # hostname = "10.0.0.2"; + # user = "bbaedorf"; + # }; + + # "salt.gateway.test" = { + # hostname = "10.0.0.3"; + # user = "root"; + # proxyJump = "salt.base.test"; + # }; + # }; + # }; + #}; +} diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix index 9a897fa6..31be8b27 100644 --- a/users/teutat3s/home.nix +++ b/users/teutat3s/home.nix @@ -13,6 +13,8 @@ with lib; let in { imports = [ ./session-variables.nix + ./concepts-and-training.nix + ./mnx.nix ]; config = { diff --git a/users/teutat3s/mnx.nix b/users/teutat3s/mnx.nix new file mode 100644 index 00000000..4bf69b46 --- /dev/null +++ b/users/teutat3s/mnx.nix @@ -0,0 +1,18 @@ +{ + config, + pkgs, + lib, + self, + ... +}: +with lib; let + psCfg = config.pub-solar; + xdg = config.home-manager.users."${psCfg.user.name}".xdg; +in { + environment = { + systemPackages = with pkgs; [ + networkmanager-fortisslvpn + openfortivpn + ]; + }; +}