diff --git a/modules/services/anubis.nix b/modules/services/anubis.nix deleted file mode 100644 index f906920..0000000 --- a/modules/services/anubis.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: -{ - users.users.nginx.extraGroups = [ config.users.groups.anubis.name ]; - services.anubis = { - defaultOptions = { - enable = true; - settings = { - SERVE_ROBOTS_TXT = true; - }; - }; - }; -} diff --git a/modules/services/binternet-proxy.nix b/modules/services/binternet-proxy.nix index 4191e01..e1ffe1f 100644 --- a/modules/services/binternet-proxy.nix +++ b/modules/services/binternet-proxy.nix @@ -1,19 +1,12 @@ -{ 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${toString config.services.anubis.instances.binternet.settings.BIND}"; + proxyPass = "http://localhost:8081"; proxyWebsockets = true; }; }; diff --git a/modules/services/grafana.nix b/modules/services/grafana.nix index e55d70c..a4dfb68 100644 --- a/modules/services/grafana.nix +++ b/modules/services/grafana.nix @@ -10,12 +10,12 @@ }; }; - nginx.virtualHosts.${config.services.grafana.settings.server.domain} = { + nginx.virtualHosts.${config.services.grafana.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.settings.server.http_port}"; + proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}"; proxyWebsockets = true; }; }; diff --git a/modules/services/librey-proxy.nix b/modules/services/librey-proxy.nix index 2bd3e7d..92da713 100644 --- a/modules/services/librey-proxy.nix +++ b/modules/services/librey-proxy.nix @@ -1,19 +1,12 @@ -{ 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${toString config.services.anubis.instances.librey.settings.BIND}"; + proxyPass = "http://localhost:8080"; proxyWebsockets = true; }; }; diff --git a/modules/services/violet.nix b/modules/services/violet.nix index 85b483d..56e02c7 100644 --- a/modules/services/violet.nix +++ b/modules/services/violet.nix @@ -2,25 +2,24 @@ { 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 ./readarr.nix) ]; - # ++ [(import ./smart-monitoring.nix)] - # ++ [(import ./jitsi-meet.nix)] + ++ [ (import ./jellyfin.nix) ] + ++ [ (import ./readarr.nix) ] + ++ [ (import ./lidarr.nix) ] + # ++ [(import ./smart-monitoring.nix)] + # ++ [(import ./jitsi-meet.nix)] + ++ [ (import ./forgejo.nix) ] + ++ [ (import ./matrix/default.nix) ]; }