From 76710140261091272ab1797243debb9de697aefd Mon Sep 17 00:00:00 2001
From: Ahwx <ahwx@ahwx.org>
Date: Wed, 31 Dec 2025 01:35:01 +0100
Subject: [PATCH] chore: comment out anubis

---
 modules/services/anubis.nix          | 18 +++++++++---------
 modules/services/attic.nix           | 17 +++++++++--------
 modules/services/binternet-proxy.nix | 20 ++++++++++++--------
 modules/services/forgejo.nix         | 17 +++++++++--------
 modules/services/guacamole.nix       | 17 +++++++++--------
 modules/services/librey-proxy.nix    | 20 ++++++++++++--------
 modules/services/uptime-kuma.nix     | 17 +++++++++--------
 7 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/modules/services/anubis.nix b/modules/services/anubis.nix
index f906920..9b12480 100644
--- a/modules/services/anubis.nix
+++ b/modules/services/anubis.nix
@@ -1,12 +1,12 @@
 { config, lib, ... }:
 {
-  users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
-  services.anubis = {
-    defaultOptions = {
-      enable = true;
-      settings = {
-        SERVE_ROBOTS_TXT = true;
-      };
-    };
-  };
+  # users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
+  #services.anubis = {
+  #  defaultOptions = {
+  #    enable = true;
+  #    settings = {
+  #      SERVE_ROBOTS_TXT = true;
+  #    };
+  #  };
+  #};
 }
diff --git a/modules/services/attic.nix b/modules/services/attic.nix
index ca91497..afce300 100644
--- a/modules/services/attic.nix
+++ b/modules/services/attic.nix
@@ -32,19 +32,20 @@
         };
       };
     };
-    anubis.instances.atticd = {
-      settings = {
-        TARGET = "http://localhost:8060";
-        BIND = ":8061";
-        BIND_NETWORK = "tcp";
-      };
-    };
+    #anubis.instances.atticd = {
+    #  settings = {
+    #    TARGET = "http://localhost:8060";
+    #    BIND = "/run/anubis/anubis-atticd/anubis.sock";
+    #    METRICS_BIND = "/run/anubis/anubis-atticd/anubis.sock";
+    #  };
+    #};
     nginx.virtualHosts."cache.liv.town" = {
       forceSSL = true;
       sslCertificate = "/var/lib/acme/liv.town/cert.pem";
       sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
       locations."/" = {
-        proxyPass = "http://localhost${toString config.services.anubis.instances.atticd.settings.BIND}";
+        # proxyPass = "http://unix:${toString config.services.anubis.instances.atticd.settings.BIND}";
+        proxyPass = "http://localhost:8060";
         proxyWebsockets = true;
       };
     };
diff --git a/modules/services/binternet-proxy.nix b/modules/services/binternet-proxy.nix
index 4191e01..922e0e9 100644
--- a/modules/services/binternet-proxy.nix
+++ b/modules/services/binternet-proxy.nix
@@ -1,19 +1,23 @@
 { config, ... }:
+let
+  target = "http://localhost:8081";
+in
 {
   services = {
-    anubis.instances.binternet = {
-      settings = {
-        TARGET = "http://localhost:8081";
-        BIND = ":8082";
-        BIND_NETWORK = "tcp";
-      };
-    };
+    #anubis.instances.binternet = {
+    #  settings = {
+    #    TARGET = target;
+    #    BIND = "/run/anubis/anubis-binternet/anubis.sock";
+    #    METRICS_BIND = "/run/anubis/anubis-binternet/anubis.sock";
+    #  };
+    #};
     nginx.virtualHosts."curate.liv.town" = {
       forceSSL = true;
       sslCertificate = "/var/lib/acme/liv.town/cert.pem";
       sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
       locations."/" = {
-        proxyPass = "http://localhost${toString config.services.anubis.instances.binternet.settings.BIND}";
+        # proxyPass = "http://unix:${toString config.services.anubis.instances.binternet.settings.BIND}";
+        proxyPass = target;
         proxyWebsockets = true;
       };
     };
diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix
index 942a874..bdfa451 100644
--- a/modules/services/forgejo.nix
+++ b/modules/services/forgejo.nix
@@ -68,19 +68,20 @@ in
     #     };
     #   };
     # };
-    anubis.instances.forgejo = {
-      settings = {
-        TARGET = "http://localhost:3050";
-        BIND = ":3051";
-        BIND_NETWORK = "tcp";
-      };
-    };
+    #anubis.instances.forgejo = {
+    #  settings = {
+    #    TARGET = "http://localhost:3050";
+    #    BIND = "/run/anubis/anubis-forgejo/anubis.sock";
+    #    METRICS_BIND = "/run/anubis/anubis-forgejo/anubis.sock";
+    #  };
+    #};
     nginx.virtualHosts."code.liv.town" = {
       forceSSL = true;
       sslCertificate = "/var/lib/acme/liv.town/cert.pem";
       sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
       locations."/" = {
-        proxyPass = "http://localhost${toString config.services.anubis.instances.forgejo.settings.BIND}";
+        # proxyPass = "http://unix:${toString config.services.anubis.instances.forgejo.settings.BIND}";
+        proxyPass = "http://localhost:3050";
         proxyWebsockets = true;
       };
     };
diff --git a/modules/services/guacamole.nix b/modules/services/guacamole.nix
index 2fdac6d..d8f210b 100644
--- a/modules/services/guacamole.nix
+++ b/modules/services/guacamole.nix
@@ -17,19 +17,20 @@
         guacd-hostname = "localhost";
       };
     };
-    anubis.instances.guacamole = {
-      settings = {
-        TARGET = "http://localhost:4822";
-        BIND = ":4883";
-        BIND_NETWORK = "tcp";
-      };
-    };
+    #anubis.instances.guacamole = {
+    #  settings = {
+    #    TARGET = "http://localhost:4822";
+    #    BIND = "/run/anubis/anubis-guacamole/anubis.sock";
+    #    METRICS_BIND = "/run/anubis/anubis-guacamole/anubis.sock";
+    #  };
+    #};
     nginx.virtualHosts."remote.liv.town" = {
       forceSSL = true;
       sslCertificate = "/var/lib/acme/liv.town/cert.pem";
       sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
       locations."/" = {
-        proxyPass = "http://localhost${toString config.services.anubis.instances.guacamole.settings.BIND}";
+        # proxyPass = "http://unix:${toString config.services.anubis.instances.guacamole.settings.BIND}";
+        proxyPass = "http://${toString config.services.guacamole-server.host}:${toString config.services.guacamole-server.port}";
         proxyWebsockets = true;
       };
     };
diff --git a/modules/services/librey-proxy.nix b/modules/services/librey-proxy.nix
index 09e95b4..8c9e03b 100644
--- a/modules/services/librey-proxy.nix
+++ b/modules/services/librey-proxy.nix
@@ -1,19 +1,23 @@
 { config, ... }:
+let
+  target = "http://localhost:8078";
+in
 {
   services = {
-    anubis.instances.librey = {
-      settings = {
-        TARGET = "http://localhost:8078";
-        BIND = ":8079";
-        BIND_NETWORK = "tcp";
-      };
-    };
+    #anubis.instances.librey = {
+    #  settings = {
+    #    TARGET = target;
+    #    BIND = "/run/anubis/anubis-librey/anubis.sock";
+    #    METRICS_BIND = "/run/anubis/anubis-librey/anubis.sock";
+    #  };
+    #};
     nginx.virtualHosts."search.liv.town" = {
       forceSSL = true;
       sslCertificate = "/var/lib/acme/liv.town/cert.pem";
       sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
       locations."/" = {
-        proxyPass = "http://localhost${toString config.services.anubis.instances.librey.settings.BIND}";
+        # proxyPass = "http://unix:${toString config.services.anubis.instances.librey.settings.BIND}";
+        proxyPass = target;
         proxyWebsockets = true;
       };
     };
diff --git a/modules/services/uptime-kuma.nix b/modules/services/uptime-kuma.nix
index 923b6f0..57da4df 100644
--- a/modules/services/uptime-kuma.nix
+++ b/modules/services/uptime-kuma.nix
@@ -5,19 +5,20 @@
       enable = true;
       settings.PORT = "4800";
     };
-    anubis.instances.uptime-kuma = {
-      settings = {
-        TARGET = "http://localhost:4800";
-        BIND = ":4801";
-        BIND_NETWORK = "tcp";
-      };
-    };
+    #anubis.instances.uptime-kuma = {
+    #  settings = {
+    #    TARGET = "http://localhost:4800";
+    #    BIND = "/run/anubis/anubis-uptime-kuma/anubis.sock";
+    #    METRICS_BIND = "/run/anubis/anubis-uptime-kuma/anubis.sock";
+    #  };
+    #};
     nginx.virtualHosts."uptime.liv.town" = {
       forceSSL = true;
       sslCertificate = "/var/lib/acme/liv.town/cert.pem";
       sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
       locations."/" = {
-        proxyPass = "http://localhost${toString config.services.anubis.instances.uptime-kuma.settings.BIND}";
+        # proxyPass = "http://unix:${toString config.services.anubis.instances.uptime-kuma.settings.BIND}";
+        proxyPass = "http://localhost:4800";
         proxyWebsockets = true;
       };
     };