From 31f14b1578d115b16e1306ce65043ec8b97bf1b7 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 11 Sep 2024 21:58:40 -0400 Subject: [PATCH] Add Oracle VM to Wireguard --- nixos/server/pixelfed.nix | 2 +- nixos/server/wireguard.nix | 4 ++++ secrets.nix | Bin 2293 -> 2359 bytes 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/server/pixelfed.nix b/nixos/server/pixelfed.nix index 44f77d3b..bc5b62b1 100644 --- a/nixos/server/pixelfed.nix +++ b/nixos/server/pixelfed.nix @@ -4,7 +4,7 @@ domain = "pics.${outputs.secrets.jimDomain}"; secretFile = pkgs.writeText "appkey" outputs.secrets.pixelfedKey; settings = { - APP_NAME = "Jimbofed"; + APP_NAME = ''"Jimbo's Pixelfed"''; INSTANCE_DESCRIPTION = ''"The Jimbosfiles Pixelfed Instance"''; INSTANCE_CONTACT_EMAIL = "jimbo@${outputs.secrets.jimDomain}"; OPEN_REGISTRATION = true; diff --git a/nixos/server/wireguard.nix b/nixos/server/wireguard.nix index 480047ed..93a4ad4b 100644 --- a/nixos/server/wireguard.nix +++ b/nixos/server/wireguard.nix @@ -25,6 +25,10 @@ in { publicKey = outputs.secrets.wirePixel9Pub; allowedIPs = [ "10.100.0.2/32" ]; } + { # Oracle VM + publicKey = outputs.secrets.wireOraclePub; + allowedIPs = [ "10.100.0.3/32" ]; + } ]; }; }; diff --git a/secrets.nix b/secrets.nix index ce61c5bd49adcc122e1f2c7efd1b0dd7fa82309e..e1087eeac474b4a6653fe77fd036eac5c680b11c 100644 GIT binary patch literal 2359 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 literal 2293 zcmZQ@_Y83kiVO&0C_SG2IlcAvfh8;c-(H@0E26GbB*=G?krYG+$>pZ@pq) z-h`FzI}F|`?u?aua(B@^uUV|u4>Rf{&ryqb`FncnL#4;5@_Wjp`}_pYOS*K3Tjj~$ zv`;UZbZt}oZ$TH1*i)B(FP2-cx6-1vu!(8*%zb*dCTCs|*rv06f5gH`@*a1pB3}kQ zcy{prVt-eK3Bp@%S6DW8uUefSs^@8&JkRaax6Q6IZPrcej?A-kmtSh|PyM5}HqTDW zV^T+q8FTu?)VF&&L|#hJn=IU~rE4aN<-dL^g`^Fy&_ugcnjB#_-Sw`Y z`}CbH+bR>baY^6Vb9d+Y^vsT9YlI`D1(w@IS7)5%3ADv}mo~JY%uL)?Ch<_&V)xlLVR8-{QQpF}_9eD% z{S)r$FbO8{+v;`+x&udevV zkay^_!P9xOj;)y87{{m-`y=@Einq>J3lm>9RA-&r+Qh(pW$Oov>&M#{d_BXEA+__| zR@0@kW2Tq4eKax(R`?uyze}xOUV7E#^$bq_`|E@Jo_yb8>LBAWFZv_miD3Vh;<4P^K1COn z8i6a_EyYC*>02H}>v6i6J(ACDo!D=-sc$}K`W<)Ar$3xm>~*_$?yddxtS0xxp{w8P zJo)eWrDetW{`zSr_T21G6X*PyB5m_dc-xi>trHFd!;AtvTPVyBN`^r9@w)uPig`G|O~{C!u|%_;}Qeyi^|eX+kdY31>{ zzn3+ct!$4?(7dA=kn;3kwz&MQi2}KP>w{Q4gjV;?v|1Nu{_^+b==ML)zuwDt`oHmJ zsOkJAV)HlO`}(8j+rl-~>mIS+@Yu_#(8VpzZm^=U^_BN-j36izrZC#L8 zd)M44(DT%#r^+SSOZ6_TD6e~&toCC0gbZ2hV-9(oeiuG^UJ%;CS;e=yO{in`qnJR> z5JOh`+7dIF`QoQ$C-0eW*?nDPb-ZiZt&6)ZJZ`m%sku@d_VDGJKjmo`HBUV`CBknj zvwr6yi;Ei^IwtdH%$e(b+alQcCZk>N+P{B%r^|@WSpRvajqx>qn-@BFUK#28W+ro- zZdQ@^TqvD&%tzzp(Ip$FFVjljA)c_-GInQmNV#aO)SEl{t~}F@&eOIMe!NE&}=hnW=`;e2G>{Oj6!z{=BP~0&a2%r-@fTlAbb4OU;ito zZBnegYyVZOcp2}xmw~eG3-4A-MPIt-wJhtvbJe+fB)%U0y;kV5_W6Gu7I#nFwDg;| zV)Ny!}F%t?9%E>LV}Bn_wQ${2)A6l$nJT;^G|PQs<;-Hoj57Ixhk!9 ziMn%Dr)qxriL@Z+PrW-Arl{v?oLx}=f7->?H^QUk$58iCwRwJm0P#D?@d43ypC_i-)R;cZlUu(|Mz+mdFQonk+G?^ ze7i(VYU}xBH)aMcn{}c;vF=YYgG3I)(K6))_B(y2#%b%Tm2u2k`Tg$hO!c(^)u%6K z3q`&c`uBc2!x`0;NzA7NcPA%pOqe#w>%z>nr~Eqv_-?2BEuD8)WHzHrK>azcwPKf) zjwuLTxc9nX$t{+pQi1*z8UjN9?u2x#wY&7k@H78;ZN-1-KR>QIf4J6t$~z;uz7O+l zn0G{<3UF<>Fss_p&FsHHJnKj8>hk@|9(O6-Gt53(Q04ZdYfa@&Zbo&pUhd%SF3WlR=bBGYT;b!%BDPqiQ0IJ*OwV7-`#YTE{9k;WqhIh- zzjOY+iX#4(Q%x9?+^XK^EOu7&Try$Vl+FKh4Bn+F886lJcF(unS)6ubrA*y+rux;F zgC@A0eOtHj(2*zWIb=GoZQr1h9jwcE;r5y9Q@-{YWVrulUZVT+`qc2BVyae};=f*c hv;O-RT_%YUDNPeJnP&eO#ryaXkq{W