From 2d280443e0987ea0d240747909958fd30aca53de Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Sun, 12 Nov 2023 15:04:59 +0530 Subject: [PATCH] cleanup secrets --- hosts/rico1/wireguard.nix | 8 ++++++-- hosts/rico2/services/adtya.xyz.nix | 3 +-- hosts/rico2/wireguard.nix | 8 ++++++-- hosts/skipper/wireguard.nix | 8 ++++++-- secrets.nix | Bin 3773 -> 2348 bytes 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/hosts/rico1/wireguard.nix b/hosts/rico1/wireguard.nix index c813f0d..7201e97 100644 --- a/hosts/rico1/wireguard.nix +++ b/hosts/rico1/wireguard.nix @@ -11,11 +11,15 @@ in enable = true; interfaces = { wg0 = { - inherit (peers."${config.networking.hostName}") ips listenPort; + ips = [ + "10.8.1.3/24" + "fdd9:69ae:9703::3/64" + ]; + listenPort = 51821; privateKeyFile = "/etc/wireguard/private.key"; generatePrivateKeyFile = true; peers = with peers; [ - Proxy.peer + Proxy ]; }; }; diff --git a/hosts/rico2/services/adtya.xyz.nix b/hosts/rico2/services/adtya.xyz.nix index 633e43c..42d806e 100644 --- a/hosts/rico2/services/adtya.xyz.nix +++ b/hosts/rico2/services/adtya.xyz.nix @@ -1,6 +1,5 @@ { pkgs , adtyaxyz -, secrets , ... }: let @@ -25,7 +24,7 @@ in handle /.well-known/discord { header Access-Control-Allow-Origin * - respond `${secrets.discord_domain_well_known}` + respond `dh=bd67bb4659b662a5ee2b1b043e7b3171b2cb44bd` } handle { diff --git a/hosts/rico2/wireguard.nix b/hosts/rico2/wireguard.nix index c813f0d..3581e8d 100644 --- a/hosts/rico2/wireguard.nix +++ b/hosts/rico2/wireguard.nix @@ -11,11 +11,15 @@ in enable = true; interfaces = { wg0 = { - inherit (peers."${config.networking.hostName}") ips listenPort; + ips = [ + "10.8.1.4/24" + "fdd9:69ae:9703::4/64" + ]; + listenPort = 51821; privateKeyFile = "/etc/wireguard/private.key"; generatePrivateKeyFile = true; peers = with peers; [ - Proxy.peer + Proxy ]; }; }; diff --git a/hosts/skipper/wireguard.nix b/hosts/skipper/wireguard.nix index c813f0d..c49e1fa 100644 --- a/hosts/skipper/wireguard.nix +++ b/hosts/skipper/wireguard.nix @@ -11,11 +11,15 @@ in enable = true; interfaces = { wg0 = { - inherit (peers."${config.networking.hostName}") ips listenPort; + ips = [ + "10.8.1.2/24" + "fdd9:69ae:9703::2/64" + ]; + listenPort = 51821; privateKeyFile = "/etc/wireguard/private.key"; generatePrivateKeyFile = true; peers = with peers; [ - Proxy.peer + Proxy ]; }; }; diff --git a/secrets.nix b/secrets.nix index 84e0dced004fcecc1bf9b408cd15022938e91f4d..4884c743ae6ceada43471df3148fc72d1a8a5219 100644 GIT binary patch literal 2348 zcmV+{3DfofM@dveQdv+`0B>)%jsjT_ag@=7UTbvB|H0;1SQ!DVtZKd46TGlpn7|Yt z=f)_slP84kZEVn%`p4SCyD~lTEDICGj@o*+*^-h)7S+-5UtVm$MaiqAgs&~@3EeFx z?ta8MYZdph?u7K-C5dYKvONx#j#n~02ybF+k2x}{Zq&Ed>YF(aKO1TFW5g~b(}0Q)XnqUx-fy;Sd& zGDj&eEB1pp(@9&(^*e~}2dv|oMgHlqU964?5s>Fw>4^?NQF_h0zQwJDH$bEysxaYv z`ls`m-xMtnkq4+Bk`9`@KXO+YyN=*k57w9O&yZ4=Jn?MVYBRQ91Q!!OL?P^>sEW#} z+QCI{9IR6q-hSAeZ_ZNx^pULbk%QvPynrxLHh*e?L`(HBiQ5{AW+ba)s`~4@4tSPS;_x^0{!WgQV@6VT# z309!@L|-HOZZWTYe(K77H)B8_nU9MPcEYe%BZ9-PmsQSR|MQU4T=z@dS5z4&xJK!aKY3Ws}47+8Oxs3hH_m$U#1w0z!fHPlZkIc zH)sl3!16DEa7|sBJ{&C; z5H86eVsd!JK)` zn4Y}=tdo*j=+9wYxP_BNmvC7$3&rRRAHqrPW3-XG(j@0d1Fj7fo*q9BODZQt*MThm zExJ4DZGeFA9YnZo!a=pif2sg-u!Wbe`Aj0!$+VZg-?R0KBggmc5%#DLNsqp?PF`Ad z$TcONIa_EB#B7iu6aI1Yzv{*LG#YmMf+icak6vWK8qa(;^He|h)f2re-~dc|dA_=I zCvM<;Xnz;juMS)>iy?yZ&9&?GZ5>6>4Ey%YQW~Y92chpNb|7!hkv7elw!|LLn(#Ek zi}Q~i-EH4M4wM@tIT5tHf3l)gI=7K!zW&+#NR26FSX|-z(;Fl9(dgeU2#KG`UGgaO z&PG(Lt%8?rS_SuKu07f}u`oPK1mQ-?STvF^Zs^0ee3ciQRp{#j|wL z6^l{ht})}?!CZ!^yxL;GE~6dVr1)9^uXK04%kpg(05Ny`|HWlDGXTzbyjAl=BI!Pc zHk1nb{;aG(d(HwN{oWrM8Rf9m^3p{2rR zn+Y&e7xl>a>Bq9SAcI2{fR(stq}@Ce^pLtHpf;iul&u%R069A>o7xdKkK<>%{!$D$ zD)Q`9ECeng=a<%a?5YZdB&;}Pg}Qk>&&R4w$tK}hJe;nEFLSXlI+mA+9|*gj z!NIA92Kl`ZfnPGp0r39)v!0pV)>?yfwHHu&}sF1W<|_#E~mVYjr8ruF>^Nr z-At~3Cc)%5rf9<&rXQ;@Df7yn5sw9d_}Ly4C3ZU^t&=PPw}( zA~=d}PqP$hjrK6NS_R^JFyfzCERE4cYX=0pW3X(MbXTY(Fwwk?So0p#pcfsoBseA9 z@pY{ay_)E_injT4p90)8)Pk)iVEp~`8P>-9dIqaXiTYKefd=d|;$mEAOjclV_5TP0 zPBLE#vV9!*5zyEhp7GYbuOK_!ro98-4S zxwABh)?HR|CFI))pC0-l| zVjDQIySOTcyS66A*miPT>Y*%Q{V3@XMIX&ijvv2E=VaepdR8I*NtIAflbSGsSa6I_hHFP0JwLf>4PMb-!Xqqcy~U!nB#zWz6w)Q%Pu(k9EwUGU>u1CI zZ9F5tfRl8Ms-w?gx@}?R#JAIZ(D=+|M+BrWO|BmUY2nK+9-vx>bnf2|L-v}t%vsR% zeUnB;$e;dUZL1gfoE1%6C&-Y~9rC1_TSicCBZrpRAB?2pk>-}rWR}vj>1WUqc2gIB S9U#*e<1ZJcS*eLpqX`z>nwek# literal 3773 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