lots of changes, including revamp of network services boot chain on mercury

3 files changed, 27 insertions, 8 deletions

diff --git a/modules/services/nixos/selfhost/adguard.nix b/modules/services/nixos/selfhost/adguard.nix
index c5e93ee..73c6caf 100644
--- a/modules/services/nixos/selfhost/adguard.nix
+++ b/modules/services/nixos/selfhost/adguard.nix
@@ -32,7 +32,8 @@ in
       DNSStubListener=no
     '';
 
-    services.caddy = lib.mkIf config.collinux.services.selfhost.caddy.enable {
+    services.caddy = lib.mkIf (config.collinux.services.selfhost.caddy.enable
+      && config.collinux.services.selfhost.magic_caddy.enable) {
       virtualHosts.${cfg.root_url}.extraConfig = ''
         ${
           if config.collinux.services.networking.tailscale.enable
diff --git a/modules/services/nixos/selfhost/forgejo.nix b/modules/services/nixos/selfhost/forgejo.nix
index b1a6095..e499e64 100644
--- a/modules/services/nixos/selfhost/forgejo.nix
+++ b/modules/services/nixos/selfhost/forgejo.nix
@@ -36,7 +36,12 @@ in
       };
     };
 
-    services.caddy = lib.mkIf config.collinux.services.selfhost.caddy.enable {
+    systemd.services."forgejo" = lib.mkIf config.collinux.services.networking.networkd.enable {
+      after = lib.mkAfter ["network-online.target"];
+      wants = lib.mkAfter ["network-online.target"];
+    };
+
+    services.caddy = lib.mkIf (config.collinux.services.selfhost.caddy.enable && config.collinux.services.selfhost.magic_caddy.enable) {
       virtualHosts.${cfg.root_url}.extraConfig = ''
         ${
           if config.collinux.services.networking.tailscale.enable
diff --git a/modules/services/nixos/selfhost/headscale.nix b/modules/services/nixos/selfhost/headscale.nix
index 9319691..9989742 100644
--- a/modules/services/nixos/selfhost/headscale.nix
+++ b/modules/services/nixos/selfhost/headscale.nix
@@ -7,12 +7,14 @@
   cfg = config.collinux.services.selfhost.headscale;
 
   acl_file = (pkgs.formats.json {}).generate "acl.json" {
-    ssh = {
-      src = ["*"];
-      dst = ["*"];
-      users = ["autogroup:nonroot" "root"];
-      action = "accept";
-    };
+    ssh = [
+      {
+        src = ["collin@"];
+        dst = ["collin@"];
+        users = ["autogroup:nonroot" "root"];
+        action = "accept";
+      }
+    ];
   };
 in
   lib.mkIf cfg.enable {
@@ -47,6 +49,17 @@ in
       };
     };
 
+    # make sure headscale can start before tailscale
+    systemd.services."headscale" = lib.mkIf config.collinux.services.networking.tailscale.enable {
+      after = lib.mkForce ["network.target"];
+      before = lib.mkForce ["headscale.target"];
+      wants = lib.mkForce ["network.target" "headscale.target"];
+    };
+
+    systemd.targets."headscale" = {
+      description = "Target represents headscale is running. started by headscale.service";
+    };
+
     services.caddy.virtualHosts.${cfg.root_url}.extraConfig = lib.mkIf config.collinux.services.selfhost.caddy.enable ''
       reverse_proxy localhost:8080
     '';