Use MagicDNS

hosts/desktop.nix

@@ -58,13 +58,10 @@ in
 
   networking.search = [ "elnu.com" ];
 
-  networking.extraHosts = ''
+  networking.hosts = {
-    192.168.0.26 elnuhub
+    "192.168.0.26" = [ "elnuhub.local" ];
-    192.168.0.26 elnuhub.local
+    "24.199.72.8" = [ "elnudrop.local" ];
-    24.199.72.8  elnudrop
+  };
-    24.199.72.8  elnudrop.local
-    ${tailscale.hosts}
-  '';
 
   #sound.enable = true;
   #hardware.pulseaudio.enable = true;

hosts/elnudrop/hosts/jichan.org/default.nix

@@ -1,4 +1,3 @@
-with import ../../../../modules/tailscale/default.nix;
 let host = "jichan.org"; in {
   services.nginx.virtualHosts."www.${host}" = {
     forceSSL = true;
@@ -12,7 +11,7 @@ let host = "jichan.org"; in {
       error_page 502 /502.html;
     '';
     locations = {
-      "/".proxyPass = "http://${elnuhub}:3334";
+      "/".proxyPass = "http://elnuhub:3334";
       "/502.html".root = "${./502}";
       "/logo.svg".root = "${./502}";
       "/missing.min.css".root = "${../shared/502}";
@@ -20,7 +19,7 @@ let host = "jichan.org"; in {
       # Formerly tatoeba.elnu.com
       # https://git.elnu.com/ElnuDev/tatoeba-api
       "/api/tatoeba/" = {
-        proxyPass = "http://${elnuhub}:3001";
+        proxyPass = "http://elnuhub:3001";
         extraConfig = ''
           rewrite ^/api/tatoeba/(.*) /$1 break;
         '';
@@ -29,7 +28,7 @@ let host = "jichan.org"; in {
       # Formerly images.elnu.com
       # https://git.elnu.com/ElnuDev/image-api
       "/api/images/" = {
-        proxyPass = "http://${elnuhub}:3002";
+        proxyPass = "http://elnuhub:3002";
         extraConfig = ''
           rewrite ^/api/images/(.*) /$1 break;
         '';

hosts/elnudrop/hosts/tegakituesday.com/default.nix

@@ -12,7 +12,7 @@ let host = "tegakituesday.com"; in {
       error_page 502 /502.html;
     '';
     locations = {
-      "/".proxyPass = "http://${elnuhub}:3335";
+      "/".proxyPass = "http://elnuhub:3335";
       "/502.html".root = "${./502}";
       "/mascot.png".root = "${./502}";
       "/missing.min.css".root = "${../shared/502}";

modules/tailscale/default.nix

@@ -1,10 +0,0 @@
-rec {
-  elnu = "100.64.0.1";
-  elnudrop = "100.64.0.2";
-  elnuhub = "100.64.0.3";
-  hosts = ''
-    ${elnu} elnu.elnu.com
-    ${elnudrop} elnudrop.elnu.com
-    ${elnuhub} elnuhub.elnu.com
-  '';
-}