diff --git a/hosts/linode/l002/nginx.nix b/hosts/linode/l002/nginx.nix index b7270ae..90bd7e8 100644 --- a/hosts/linode/l002/nginx.nix +++ b/hosts/linode/l002/nginx.nix @@ -53,14 +53,6 @@ proxyPass = "http://100.64.0.1:3080"; }; }; - "db.joshuabell.xyz" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://100.64.0.1:3085"; - }; - }; "gist.joshuabell.xyz" = { enableACME = true; forceSSL = true; diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 974b2e0..5c9bde7 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -1210,11 +1210,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745585761, - "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=", + "lastModified": 1746068171, + "narHash": "sha256-QmZ0oKt8AHpkOUnD8i+Zr278J+t7kZLYAWUs8s5QOF0=", "ref": "refs/heads/master", - "rev": "e5523910a0c07c88d026d006f5962434bfa53548", - "revCount": 277, + "rev": "46dbdc77583ea181c7ca4836f46888d1f8e2a704", + "revCount": 278, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, diff --git a/hosts/oracle/o001/nginx.nix b/hosts/oracle/o001/nginx.nix index e9901d3..ba8d491 100644 --- a/hosts/oracle/o001/nginx.nix +++ b/hosts/oracle/o001/nginx.nix @@ -52,11 +52,21 @@ # Redirect self IP to domain "64.181.210.7" = { locations."/" = { - return = "301 https://o001.joshuabell.xyz"; + return = "301 https://joshuabell.xyz"; }; }; - "o001.joshuabell.xyz" = { + "100.64.0.11" = tailnetConfig; + "o001.net.joshuabell.xyz" = tailnetConfig; + + "www.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + return = "301 https://joshuabell.xyz"; + }; + }; + "joshuabell.xyz" = { enableACME = true; forceSSL = true; locations = { @@ -74,7 +84,6 @@
- In the void you roam,
A page that cannot be found-
Turn back, seek anew. @@ -87,13 +96,49 @@ }; }; - "100.64.0.11" = tailnetConfig; - "o001.net.joshuabell.xyz" = tailnetConfig; + "www.ellalala.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + return = "301 https://ellalala.com"; + }; + }; + "ellalala.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + return = "444"; + }; + }; + + # PROXY HOSTS + "chat.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyWebsockets = true; + proxyPass = "http://100.64.0.1:3080"; + }; + }; + "gist.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://100.64.0.13"; + }; + }; + "git.joshuabell.xyz" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://100.64.0.13"; + }; + }; "_" = { default = true; locations."/" = { - return = "404"; # 404 for not found or 444 for drop + return = "444"; # 404 for not found or 444 for drop }; }; };