chore: merge remote-tracking branch 'refs/remotes/origin/master'

modules/services/anubis.nix

@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+{
+  users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
+  services.anubis = {
+    defaultOptions = {
+      enable = true;
+      settings = {
+        SERVE_ROBOTS_TXT = true;
+      };
+    };
+  };
+}

modules/services/binternet-proxy.nix

@@ -1,12 +1,19 @@
-{ ... }:
+{ config, ... }:
 {
   services = {
+    anubis.instances.binternet = {
+      settings = {
+        TARGET = "http://localhost:8081";
+        BIND = ":8082";
+        BIND_NETWORK = "tcp";
+      };
+    };
     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:8081";
+        proxyPass = "http://localhost${toString config.services.anubis.instances.binternet.settings.BIND}";
         proxyWebsockets = true;
       };
     };

modules/services/grafana.nix

@@ -10,12 +10,12 @@
       };
     };
 
-    nginx.virtualHosts.${config.services.grafana.domain} = {
+    nginx.virtualHosts.${config.services.grafana.settings.server.domain} = {
       forceSSL = true;
       sslCertificate = "/var/lib/acme/liv.town/cert.pem";
       sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
       locations."/" = {
-        proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}";
+        proxyPass = "http://127.0.0.1:${toString config.services.grafana.settings.server.http_port}";
         proxyWebsockets = true;
       };
     };

modules/services/librey-proxy.nix

@@ -1,12 +1,19 @@
-{ ... }:
+{ config, ... }:
 {
   services = {
+    anubis.instances.librey = {
+      settings = {
+        TARGET = "http://localhost:8080";
+        BIND = ":8079";
+        BIND_NETWORK = "tcp";
+      };
+    };
     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:8080";
+        proxyPass = "http://localhost${toString config.services.anubis.instances.librey.settings.BIND}";
         proxyWebsockets = true;
       };
     };

modules/services/violet.nix

@@ -2,24 +2,25 @@
 {
   imports =
     [ (import ./invidious.nix) ]
+    ++ [ (import ./anubis.nix) ]
+    ++ [ (import ./binternet-proxy.nix) ]
+    ++ [ (import ./docker.nix) ]
+    ++ [ (import ./frp.nix) ]
+    ++ [ (import ./forgejo.nix) ]
+    ++ [ (import ./grafana.nix) ]
+    ++ [ (import ./gokapi.nix) ]
+    ++ [ (import ./jellyfin.nix) ]
+    ++ [ (import ./librey-proxy.nix) ]
+    ++ [ (import ./lidarr.nix) ]
+    ++ [ (import ./matrix/default.nix) ]
     ++ [ (import ./mumble.nix) ]
+    ++ [ (import ./monitoring.nix) ]
     ++ [ (import ./ntfy.nix) ]
     ++ [ (import ./sharkey-proxy.nix) ]
-    ++ [ (import ./librey-proxy.nix) ]
-    ++ [ (import ./binternet-proxy.nix) ]
-    ++ [ (import ./grafana.nix) ]
-    ++ [ (import ./monitoring.nix) ]
-    ++ [ (import ./docker.nix) ]
-    ++ [ (import ./gokapi.nix) ]
     ++ [ (import ./nginx.nix) ]
     # ++ [(import ./komga.nix)]
-    ++ [ (import ./frp.nix) ]
     ++ [ (import ./radicale.nix) ]
-    ++ [ (import ./jellyfin.nix) ]
-    ++ [ (import ./readarr.nix) ]
-    ++ [ (import ./lidarr.nix) ]
+    ++ [ (import ./readarr.nix) ];
   # ++ [(import ./smart-monitoring.nix)]
   # ++ [(import ./jitsi-meet.nix)]
-    ++ [ (import ./forgejo.nix) ]
-    ++ [ (import ./matrix/default.nix) ];
 }