no more mkCaddyConfig, manually specify ports, no more manual /etc/hosts, started using dnsmasq instead. all works!

1 files changed, 5 insertions, 4 deletions

diff --git a/modules/services/nixos/btopweb.nix b/modules/services/nixos/btopweb.nix
index d27ede1..d8f4598 100644
--- a/modules/services/nixos/btopweb.nix
+++ b/modules/services/nixos/btopweb.nix
@@ -15,10 +15,6 @@
     proc_colors = true
   '';
 in {
-  imports = [
-    (import ./mkCaddyCfg.nix cfg)
-  ];
-
   config = lib.mkIf cfg.enable {
     users.groups."btopweb" = {};
     users.users."btopweb" = {
@@ -40,5 +36,10 @@ in {
         ExecStart = ''${pkgs.ttyd}/bin/ttyd -W -i ${cfg.listenAddr} -p ${toString cfg.port} -t renderType=canvas -t fontSize=16 ${pkgs.btop}/bin/btop -c ${btopSettings}'';
       };
     };
+
+    services.caddy.virtualHosts."btop.ganymede".extraConfig = ''
+      tls internal
+      reverse_proxy 127.0.0.1:${toString cfg.port}
+    '';
   };
 }