ElnuDev/nix-config
ElnuDev/nix-config
1
1
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: ElnuDev:77ac1db6980902ce57ae5ec80d12337d3eebc5b6
Branches Tags
ElnuDev:main
ElnuDev:inky
...
compare: ElnuDev:25cb4f70ece4f41bb41b97587f8f9f2c0bc3f045
Branches Tags
ElnuDev:main
ElnuDev:inky

5 commits
77ac1db698 ... 25cb4f70ec

Author SHA1 Message Date
ElnuDev
25cb4f70ec Add jichan.org API routes, minor tweaks 2023-08-06 16:49:31 -07:00
ElnuDev
51c5d2bc2c Fix 502 static routes 2023-08-06 16:48:11 -07:00
ElnuDev
7c18d72d9d Fix hosts 2023-08-06 16:36:41 -07:00
ElnuDev
b416d555d2 Redirect www.jichan.org to jichan.org, use forceSSL for tegakituesday.com 2023-08-06 14:35:10 -07:00
ElnuDev
c2a6deebf9 Add tegakituesday.com 2023-08-06 14:31:49 -07:00
11 changed files with 87 additions and 10 deletions
Show stats Expand all files Collapse all files

2
hosts/desktop.nix
View file

@ -59,7 +59,9 @@ in
networking.extraHosts = '' networking.extraHosts = ''
192.168.0.26 elnuhub 192.168.0.26 elnuhub
192.168.0.26 elnuhub.local
24.199.72.8 elnudrop 24.199.72.8 elnudrop
24.199.72.8 elnudrop.local
${tailscale.hosts} ${tailscale.hosts}
''; '';

5
hosts/elnudrop/README.md Normal file
View file

@ -0,0 +1,5 @@
Remote rebuild:
```SH
ga -A . && nixos-rebuild switch --flake .#elnudrop --target-host root@elnudrop
```

1
hosts/elnudrop/default.nix
View file

@ -11,6 +11,7 @@
./modules/tailscale.nix ./modules/tailscale.nix
./hosts/jichan.org ./hosts/jichan.org
./hosts/tegakituesday.com
]; ];
networking.firewall = { networking.firewall = {

4
hosts/elnudrop/hosts/jichan.org/502/502.html
View file

@ -3,13 +3,13 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="missing.min.css"> <!-- missing.css@1.0.9 --> <link rel="stylesheet" href="/missing.min.css">
<style>:root { cursor: inherit } button { cursor: pointer }</style> <style>:root { cursor: inherit } button { cursor: pointer }</style>
<title>jichan.org is offline</title> <title>jichan.org is offline</title>
</head> </head>
<body> <body>
<main> <main>
<img src="logo.svg" alt="Logo" style="height: 4em; display: block; margin: 1em auto 1em auto"> <img src="/logo.svg" alt="Logo" style="height: 4em; display: block; margin: 1em auto 1em auto">
<p class="<h3>"> <p class="<h3>">
<b>jichan.org</b> is currently offline for maintenance or due to an electrical outage. <b>jichan.org</b> 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! Thank you for your patience and please check back soon. Sorry for the inconvenience!

35
hosts/elnudrop/hosts/jichan.org/default.nix
View file

@ -1,18 +1,39 @@
{ with import ../../../../modules/tailscale/default.nix;
services.nginx.virtualHosts."jichan.org" = { let host = "jichan.org"; in {
services.nginx.virtualHosts."www.${host}" = {
forceSSL = true;
enableACME = true;
globalRedirect = host;
};
services.nginx.virtualHosts."${host}" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
extraConfig = '' extraConfig = ''
error_page 502 /502.html; error_page 502 /502.html;
''; '';
locations = { locations = {
"/" = { "/".proxyPass = "http://${elnuhub}:3334";
proxyPass = with import ../../../../modules/tailscale/default.nix; "http://${elnuhub}:3334";
proxyWebsockets = true;
};
"/502.html".root = "${./502}"; "/502.html".root = "${./502}";
"/logo.svg".root = "${./502}"; "/logo.svg".root = "${./502}";
"/missing.min.css".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;
'';
};
}; };
}; };
} }

0
hosts/elnudrop/hosts/jichan.org/502/missing.min.css → hosts/elnudrop/hosts/shared/502/missing.min.css vendored
View file

1
hosts/elnudrop/hosts/shared/README.md Normal file
View file

@ -0,0 +1 @@
[missing.css@1.0.9](https://missing.style/)

24
hosts/elnudrop/hosts/tegakituesday.com/502/502.html Normal file
View file

@ -0,0 +1,24 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/missing.min.css">
<style>:root { cursor: inherit } button { cursor: pointer }</style>
<title>Tegaki Tuesday is offline</title>
</head>
<body>
<main>
<img src="/mascot.png" alt="字ちゃん" style="height: 12em; display: block; margin: 1em auto 1em auto">
<p class="<h3>">
<b>Tegaki Tuesday</b> 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!
</p>
<p lang="ja" class="<h4>">
現在、<b>手書きの火曜日</b>はメンテナンスのため、または停電のためオフラインとなっております。
しばらくお待ちください。ご迷惑をおかけして申し訳ございません！
</p>
<p class="text-align:center">Prolonged outage? <a href="https://discord.com/users/441283734214279178">Notify me on Discord.</a></p>
</main>
</body>
</html>

BIN
hosts/elnudrop/hosts/tegakituesday.com/502/mascot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 980 KiB

21
hosts/elnudrop/hosts/tegakituesday.com/default.nix Normal file
View file

@ -0,0 +1,21 @@
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}";
};
};
}

4
modules/tailscale/default.nix
View file

@ -3,6 +3,8 @@ rec {
elnudrop = "100.64.0.2"; elnudrop = "100.64.0.2";
elnuhub = "100.64.0.3"; elnuhub = "100.64.0.3";
hosts = '' hosts = ''
elnu ${elnu} ${elnu} elnu.elnu.com
${elnudrop} elnudrop.elnu.com
${elnuhub} elnuhub.elnu.com
''; '';
} }