diff --git a/hosts/desktop.nix b/hosts/desktop.nix index de98c63..25233e0 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -59,9 +59,7 @@ in networking.extraHosts = '' 192.168.0.26 elnuhub - 192.168.0.26 elnuhub.local 24.199.72.8 elnudrop - 24.199.72.8 elnudrop.local ${tailscale.hosts} ''; diff --git a/hosts/elnudrop/README.md b/hosts/elnudrop/README.md deleted file mode 100644 index b6c2aa4..0000000 --- a/hosts/elnudrop/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Remote rebuild: - -```SH -ga -A . && nixos-rebuild switch --flake .#elnudrop --target-host root@elnudrop -``` \ No newline at end of file diff --git a/hosts/elnudrop/default.nix b/hosts/elnudrop/default.nix index 116aede..d29a299 100644 --- a/hosts/elnudrop/default.nix +++ b/hosts/elnudrop/default.nix @@ -11,7 +11,6 @@ ./modules/tailscale.nix ./hosts/jichan.org - ./hosts/tegakituesday.com ]; networking.firewall = { diff --git a/hosts/elnudrop/hosts/jichan.org/502/502.html b/hosts/elnudrop/hosts/jichan.org/502/502.html index 4858a48..c1e085e 100644 --- a/hosts/elnudrop/hosts/jichan.org/502/502.html +++ b/hosts/elnudrop/hosts/jichan.org/502/502.html @@ -3,13 +3,13 @@ - + jichan.org is offline
- Logo + Logo

jichan.org is currently offline for maintenance or due to an electrical outage. Thank you for your patience and please check back soon. Sorry for the inconvenience! diff --git a/hosts/elnudrop/hosts/shared/502/missing.min.css b/hosts/elnudrop/hosts/jichan.org/502/missing.min.css similarity index 100% rename from hosts/elnudrop/hosts/shared/502/missing.min.css rename to hosts/elnudrop/hosts/jichan.org/502/missing.min.css diff --git a/hosts/elnudrop/hosts/jichan.org/default.nix b/hosts/elnudrop/hosts/jichan.org/default.nix index 9c16b7a..9cdf1b9 100644 --- a/hosts/elnudrop/hosts/jichan.org/default.nix +++ b/hosts/elnudrop/hosts/jichan.org/default.nix @@ -1,39 +1,18 @@ -with import ../../../../modules/tailscale/default.nix; -let host = "jichan.org"; in { - services.nginx.virtualHosts."www.${host}" = { - forceSSL = true; - enableACME = true; - globalRedirect = host; - }; - services.nginx.virtualHosts."${host}" = { +{ + services.nginx.virtualHosts."jichan.org" = { forceSSL = true; enableACME = true; extraConfig = '' error_page 502 /502.html; ''; locations = { - "/".proxyPass = "http://${elnuhub}:3334"; + "/" = { + proxyPass = with import ../../../../modules/tailscale/default.nix; "http://${elnuhub}:3334"; + proxyWebsockets = true; + }; "/502.html".root = "${./502}"; "/logo.svg".root = "${./502}"; - "/missing.min.css".root = "${../shared/502}"; - - # Formerly tatoeba.elnu.com - # https://git.elnu.com/ElnuDev/tatoeba-api - "/api/tatoeba/" = { - proxyPass = "http://${elnuhub}:3001"; - extraConfig = '' - rewrite ^/api/tatoeba/(.*) /$1 break; - ''; - }; - - # Formerly images.elnu.com - # https://git.elnu.com/ElnuDev/image-api - "/api/images/" = { - proxyPass = "http://${elnuhub}:3002"; - extraConfig = '' - rewrite ^/api/images/(.*) /$1 break; - ''; - }; + "/missing.min.css".root = "${./502}"; }; }; } \ No newline at end of file diff --git a/hosts/elnudrop/hosts/shared/README.md b/hosts/elnudrop/hosts/shared/README.md deleted file mode 100644 index 2ec0504..0000000 --- a/hosts/elnudrop/hosts/shared/README.md +++ /dev/null @@ -1 +0,0 @@ -[missing.css@1.0.9](https://missing.style/) \ No newline at end of file diff --git a/hosts/elnudrop/hosts/tegakituesday.com/502/502.html b/hosts/elnudrop/hosts/tegakituesday.com/502/502.html deleted file mode 100644 index fc16162..0000000 --- a/hosts/elnudrop/hosts/tegakituesday.com/502/502.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - Tegaki Tuesday is offline - - -

- 字ちゃん -

- Tegaki Tuesday is currently offline for maintenance or due to an electrical outage. - Thank you for your patience and please check back soon. Sorry for the inconvenience! -

-

- 現在、手書きの火曜日はメンテナンスのため、または停電のためオフラインとなっております。 - しばらくお待ちください。ご迷惑をおかけして申し訳ございません！ -

-

Prolonged outage? Notify me on Discord.

-
- - \ No newline at end of file diff --git a/hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png b/hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png deleted file mode 100644 index d0c6ca0..0000000 Binary files a/hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png and /dev/null differ diff --git a/hosts/elnudrop/hosts/tegakituesday.com/default.nix b/hosts/elnudrop/hosts/tegakituesday.com/default.nix deleted file mode 100644 index 91e5c7a..0000000 --- a/hosts/elnudrop/hosts/tegakituesday.com/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -with import ../../../../modules/tailscale/default.nix; -let host = "tegakituesday.com"; in { - services.nginx.virtualHosts."www.${host}" = { - forceSSL = true; - enableACME = true; - globalRedirect = host; - }; - services.nginx.virtualHosts."${host}" = { - forceSSL = true; - enableACME = true; - extraConfig = '' - error_page 502 /502.html; - ''; - locations = { - "/".proxyPass = "http://${elnuhub}:3335"; - "/502.html".root = "${./502}"; - "/mascot.png".root = "${./502}"; - "/missing.min.css".root = "${../shared/502}"; - }; - }; -} \ No newline at end of file diff --git a/modules/tailscale/default.nix b/modules/tailscale/default.nix index a7ffce8..870cf93 100644 --- a/modules/tailscale/default.nix +++ b/modules/tailscale/default.nix @@ -3,8 +3,6 @@ rec { elnudrop = "100.64.0.2"; elnuhub = "100.64.0.3"; hosts = '' - ${elnu} elnu.elnu.com - ${elnudrop} elnudrop.elnu.com - ${elnuhub} elnuhub.elnu.com + elnu ${elnu} ''; } \ No newline at end of file