clean up caddy config options for services

5 files changed, 27 insertions, 22 deletions

diff --git a/modules/services/nixos/default.nix b/modules/services/nixos/default.nix
index 1ad53bf..e9bc46c 100644
--- a/modules/services/nixos/default.nix
+++ b/modules/services/nixos/default.nix
@@ -1,12 +1,10 @@
 {
   imports = [
-    # ./navidrome.nix
-    ./headscale.nix
+    ./navidrome.nix
     ./forgejo.nix
     ./openssh.nix
     # ./jellyfin.nix
     ./caddy.nix
-    ./adguard.nix
 
     ./copyparty.nix
     ./ngircd.nix
diff --git a/modules/services/nixos/forgejo.nix b/modules/services/nixos/forgejo.nix
index 1854f0f..91db5a6 100644
--- a/modules/services/nixos/forgejo.nix
+++ b/modules/services/nixos/forgejo.nix
@@ -16,18 +16,25 @@ in {
       database.type = "sqlite3";
       settings = {
         server = {
-          DOMAIN = "localhost";
           PROTOCOL = "http";
-          ROOT_URL = cfg.root_url;
+          ROOT_URL = "https://${
+            if cfg.publicURL
+            then cfg.publicURL
+            else if cfg.privateURL
+            then cfg.privateURL
+            else ""
+          }";
+
+          HTTP_ADDR = cfg.listenAddr;
           HTTP_PORT = cfg.port;
 
+          OFFLINE_MODE = true; # don't use cdns or gravatar
+
           # ssh
-          START_SSH_SERVER = true; # use builtin ssh server
-          BUILTIN_SSH_SERVER_USER = "git";
-          SSH_DOMAIN = cfg.root_url or "ganymede";
-          SSH_PORT = cfg.git_ssh_port; # don't conflict with system ssh
-          SSH_LISTEN_HOST = cfg.bind_host;
-          SSH_LISTEN_PORT = cfg.git_ssh_port;
+          START_SSH_SERVER = false; # use system ssh server
+          SSH_USER = "forgejo";
+          SSH_DOMAIN = "williamsfam.us.com";
+          SSH_PORT = 22;
         };
         service = {
           DISABLE_REGISTRATION = true;
diff --git a/modules/services/nixos/mkCaddyCfg.nix b/modules/services/nixos/mkCaddyCfg.nix
index d7b74c0..f13e40a 100644
--- a/modules/services/nixos/mkCaddyCfg.nix
+++ b/modules/services/nixos/mkCaddyCfg.nix
@@ -1,32 +1,32 @@
 cfg: {
   networking.extraHosts =
-    if cfg.caddy.local.enable
+    if cfg.privateURL
     then ''
-      127.0.0.1 ${cfg.service_name}.collinux
+      127.0.0.1 ${cfg.privateURL}
     ''
     else "";
 
   services.caddy.virtualHosts =
     (
-      if cfg.caddy.global.enable && (cfg.root_url != null)
+      if cfg.publicURL
       then {
-        ${cfg.root_url}.extraConfig = ''
+        ${cfg.publicURL}.extraConfig = ''
           ${
             if cfg.caddy.bind_tailscale
             then "bind tailscale/${cfg.service_name}"
             else ""
           }
-          reverse_proxy ${cfg.bind_host}:${toString cfg.port}
+          reverse_proxy ${cfg.listenAddr}:${toString cfg.port}
         '';
       }
       else {}
     )
     // (
-      if cfg.caddy.local.enable
+      if cfg.caddy.privateURL
       then {
-        "${cfg.service_name}.collinux".extraConfig = ''
+        "${cfg.privateURL}.collinux".extraConfig = ''
           tls internal
-          reverse_proxy ${cfg.bind_host}:${toString cfg.port}
+          reverse_proxy ${cfg.listenAddr}:${toString cfg.port}
         '';
       }
       else {}
diff --git a/modules/services/nixos/navidrome.nix b/modules/services/nixos/navidrome.nix
index 86fdad6..27b369d 100644
--- a/modules/services/nixos/navidrome.nix
+++ b/modules/services/nixos/navidrome.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  cfg = config.collinux.services.selfhost.navidrome;
+  cfg = config.collinux.services.navidrome;
 in {
   imports = [
     (import ./mkCaddyCfg.nix cfg)
@@ -14,7 +14,7 @@ in {
       enable = true;
       settings = {
         Port = cfg.port;
-        Address = cfg.bind_host;
+        Address = cfg.listenAddr;
         EnableInsightsCollector = false;
         MusicFolder = "/media/music";
       };
diff --git a/modules/services/nixos/openssh.nix b/modules/services/nixos/openssh.nix
index c0c8c30..be2b51c 100644
--- a/modules/services/nixos/openssh.nix
+++ b/modules/services/nixos/openssh.nix
@@ -33,7 +33,7 @@ in {
       listenAddresses =
         cfg.portConfig
         |> builtins.map (x: {
-          addr = "0.0.0.0";
+          addr = x.listenAddr;
           port = x.port;
         });