headscale

2 files changed, 28 insertions, 15 deletions

diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index b073f9a..e6f18ab 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -12,24 +12,22 @@
       hash = "sha256-BQdm8p9eDGhRu6mKyX2FAUaKoU6Lv2A746Sey39T13I=";
     });
 
-    extraConfig = ''
-      {
-        acme_dns porkbun {
-          api_key {env.PORKBUN_API_KEY}
-          api_secret_key {env.PORKBUN_API_SECRET_KEY}
-        }
+    globalConfig = ''
+      acme_dns porkbun {
+        api_key {env.PORKBUN_API_KEY}
+        api_secret_key {env.PORKBUN_API_SECRET_KEY}
       }
     '';
 
     virtualHosts."https://web.tail7cca06.ts.net".extraConfig = ''
       bind tailscale/web
-      root * /var/www/williams_web
+      root * /var/www
       file_server
+    '';
 
-      handle_path /papa_stories/* {
-        root * /var/www/papa_stories
-        file_server
-      }
+    virtualHosts."https://williamsfam.us.com".extraConfig = ''
+      root * /var/www
+      file_server
     '';
   };
 }
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index 50ef29a..c2b312f 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -1,4 +1,6 @@
-{config, ...}: {
+{config, ...}: let
+  tailscaleIP = "100.69.180.89";
+in {
   collinux = {
     user.name = "collin";
 
@@ -32,12 +34,25 @@
           };
         };
         tailscale.enable = true;
-        sshd.enable = true;
+        sshd = {
+          enable = true;
+          bind_host = tailscaleIP;
+        };
       };
 
       selfhost = {
-        adguard.enable = true;
-        forgejo.enable = true;
+        adguard = {
+          enable = true;
+          bind_host = tailscaleIP;
+        };
+        forgejo = {
+          enable = true;
+          bind_host = tailscaleIP;
+        };
+        headscale = {
+          enable = true;
+          root_url = "https://headscale.williamsfam.us.com";
+        };
         caddy = {
           enable = true;
           envFile = config.collinux.secrets."caddy-env".path;