From a7d59f6d968a98ef45378f5c39ac01decebec023 Mon Sep 17 00:00:00 2001 From: dusk Date: Fri, 22 Nov 2024 02:35:08 +0900 Subject: [PATCH] feat: new subdomains, redirect stuff --- flake.lock | 12 ++++++------ hosts/wolumonde/modules/atproto.nix | 10 ++++++++++ hosts/wolumonde/modules/limbusart.nix | 8 +++++++- hosts/wolumonde/modules/nginx.nix | 2 ++ secrets/websiteConfig.age | Bin 1117 -> 1395 bytes 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index a59a2d8..97e4448 100644 --- a/flake.lock +++ b/flake.lock @@ -100,8 +100,8 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1727795645, - "narHash": "sha256-yJZbfE3UIqNDCHNNs+73eToN4MMpq3UxnhOEzYTrfGo=", + "lastModified": 1731969219, + "narHash": "sha256-FkzplQ6ro4XeiPzm6tOY4zhI4Tw/iwQ/nOQU+f3biLk=", "type": "tarball", "url": "https://git.gaze.systems/gazesys/website/releases/download/latest/source.tgz" }, @@ -835,11 +835,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1718118942, - "narHash": "sha256-kYj27WotKcbDsaxjByFPvAfRDQFpKqld5TXQevCh3b4=", + "lastModified": 1730541623, + "narHash": "sha256-/R+fLHxZHn3eTlpWObgHw/yrj+Ap7gb+HZtAwn6DnNE=", "ref": "refs/heads/master", - "rev": "3e7076c748ef19c1fb23fe2631337240440d6f04", - "revCount": 37, + "rev": "a32954e841bf66819b5e584831417451f342b819", + "revCount": 40, "type": "git", "url": "https://git.gaze.systems/dusk/limbusart.git" }, diff --git a/hosts/wolumonde/modules/atproto.nix b/hosts/wolumonde/modules/atproto.nix index 8dc3282..135f772 100644 --- a/hosts/wolumonde/modules/atproto.nix +++ b/hosts/wolumonde/modules/atproto.nix @@ -13,4 +13,14 @@ in { alias ${wellKnownFile}/; ''; }; + # redirect any requests to my profile + services.nginx.virtualHosts."bsky.gaze.systems" = { + useACMEHost = "gaze.systems"; + forceSSL = true; + extraConfig = '' + location / { + return 301 https://bsky.app/profile/gaze.systems$request_uri; + } + ''; + }; } diff --git a/hosts/wolumonde/modules/limbusart.nix b/hosts/wolumonde/modules/limbusart.nix index e5a5605..8d1af5e 100644 --- a/hosts/wolumonde/modules/limbusart.nix +++ b/hosts/wolumonde/modules/limbusart.nix @@ -33,9 +33,15 @@ in { }; users.groups.limbusart = {}; - services.nginx.virtualHosts."limbus.gaze.systems" = { + services.nginx.virtualHosts."pmart.gaze.systems" = { useACMEHost = "gaze.systems"; forceSSL = true; locations."/".proxyPass = "http://localhost:3000"; }; + # redirects + services.nginx.virtualHosts."limbus.gaze.systems" = { + useACMEHost = "gaze.systems"; + forceSSL = true; + globalRedirect = "pmart.gaze.systems"; + }; } diff --git a/hosts/wolumonde/modules/nginx.nix b/hosts/wolumonde/modules/nginx.nix index 49f55b7..6527570 100644 --- a/hosts/wolumonde/modules/nginx.nix +++ b/hosts/wolumonde/modules/nginx.nix @@ -20,7 +20,9 @@ "mq.gaze.systems" "couchdb.gaze.systems" "doc.gaze.systems" + "pmart.gaze.systems" "limbus.gaze.systems" + "bsky.gaze.systems" ]; }; }; diff --git a/secrets/websiteConfig.age b/secrets/websiteConfig.age index 6b617e8b49980cd53ee8bf9a7ba774f9e6d25fbc..d6089294ef16b49993f52ebd522be6e57bdae23e 100644 GIT binary patch literal 1395 zcmXxi>yOg}003~{c<59f7jqh3xyU6Rj61Z=ytdvwbIocn&2Fw#GA5ja+P#3gc-~cq0K@j8PKWOGVW|DtmeU_&1;vVexD1; zE46ByuSEI1X#fH}fkZwcd2pVr<_jS!opIDugBZuS3ZbYanTkSLyMxU|ISUMeJeIIY zY|Y>9F3^xx${}&597Wm*A8I2d!m0CSkZ0m~uOXSLnq7WBWw!@BQ4qBT%>r0-x!Tb< z+1>Jg!j&A0hJs1pq}`DUfq`VZc}q8L5<2 ziE@I<23di#Frd|vz-waNfjaX5j6wyAKNum(EQzZw1LR8Q!)*!4Njtc-hVdBelM`M= z#GqigO;@a3Ms@<3SRxa}co8c5AipsKqb12{v=qIHOd3crqD6UEj!_n3Tgj7@-43 zjj1McsFwD5sQ@lUU3CON1J$S)tGk4%H5f!$p3P~p&FzI0gOJJ<&1BYC6xwR8jJH^{ zwg*F;zYtDqR?LxM>S2+yrgff8YyUq^rvSU%>TC|=&>$!_yYh-6b0Fm{IIx(}jAp<} zyF{16C=HMT5u!bDN=N>)KpSr;z+v6#SA{T8uT)_p5`z3iCY@B1hz-|lRlcaoE-E4M zVJ~DbnM}>3D2o9a2Z@wQC7rq=>hY>E$ymHqM}XEjxj_3 zpAYx8bg=61!{DgV!AH#_n+KtS$p!w&Rs1-wvS#I({4dcfqInKIc>+~ko|J= z#PHT#W8lvpOix?PtsTkX+hgw`m3UXrx*<@1h^4I*cH zChR_7`FrEs-^qrNO=E)h&IjXLuijZTe@Gu;nsKgYQU2WZZ#R9g#k2qToeNi%zBYC8 zp(Rg~lJe*HC5f8@?_a+7)9mYSVJ~#bUHA5W*L~yml+nNT{`UHu#@!#U8z?`#v}nS< zNBi;z`(_fkLxV#tpPXKIZgB4MgMW2j+R~kW_06+Q$2MJY{;_oY%1QS!AC5RNpqnm8 zx3G76M_8u~e*JyObTSBBwhwEJ4AqUTv#ws)GUE8Ca z{%FS*?s0WBUpb~6rG}a3eRlo?b996<(s-lu=&Z>jx#qizuDzXnZbkptHBVYzT+lJc z^tdv$;l{JGQO7%vg8!_TzdBO>0sdv_jd_g+IQ-&~j&A4eLw)C*J-!($Uz$7cFZ9h8 A(EtDd literal 1117 zcmXxiOUT;<0KjpEFkHmphj8FB2z@!7dKw7{d4zC+_iy7l#TS+{OF<@`JzSdlhfuWXp6u zN+wSynGY3Jpt89>n+26@X07A)xUhVHhgutfr^z(w4a}$ymvoWgyuZ;NOsp(Z$L>_Y zv4nGi@lcy$C_h33cEA+%lnBP|459!rt$`(5Z%@gDXAF3dcR|9R=rg=mO13LB=JG`C zv1nTm7Y-BUolen<8d7IPbx7Tv#3EptREW+Cj)+=8+4h6(y~3SLIBU`$_O@Hs)>|VIPWE~VGi@zqDby0n2|WcsaSv- z*d&)y%PKXUSafT$hM4wHCfalWG-}+EC2LxS<@HR*U8`!+EM1NHw7DAKtGpZ~hVIXC zM#7aYZ8WsBgAYcXKFELzRwGSd%z2dKNx^aesceDP4X$m8BxYnQ1#+6W5Y5$;@8hnA z$km+o47Zv(7&3*hu}dnjt^f|lC&cuw11;e?J%$(92&LxO3Zs@h!KG3p7dmG5Ldt*( zbu5H*lxUG(lRYa01yJe&?W7EC9nXB%mJQS)n`)F!l2G+lTo;1vB}#S!Whu2=5!vat zVx|g)m_i3ueQqI$t_FbPK%+jMBau_Wl2Z)hd1wd=j&88Fg9s7cxWbdA@Ysyv@ys5yZ^Tkw;rkl78fh5i4r=OVRQ zbz{8~vV6l|cVe+8QyJ+X^R}8VrZBohG%>VslFs@KBmoUM;0=LSX$PpGnvKMTKdfm? zo9!;}akD>5nIMQ(&Qh9rGfVWegjbs^3sfqVb-@&Cv1xF`T(u~#0Yb{kj7MBp&P|Vs zQ3}RZ?SVY-*hKhWD)`nwJaXO6#+UZs!2mkwR~=indR zty{-0U+7+YgL&-M+KoHWhZXaK6VKXjp4+_tp;I4itbOtE-bW@!Hoj^q&m3DnjUK|1 z)7#e%i;Q!9|G!6~OP}t&edA*5^KV~2cl(K-w=aF;|G0MH$)jg~{ZqQ49(fhnzOuDr v0aAY-rA9`6wRrjaHJpAvyEk%P+4I1i$w~ZSYv=ikH}8A&?ZIpQ%?JMjxfzyO