diff --git a/flake.nix b/flake.nix index d47fbe6..768253b 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "The Nixarr Nixos Module for Hosting the \"*Arrs\""; + description = "The Nixarr Media Server Nixos Module"; nixConfig = { extra-substituters = ["https://nix-community.cachix.org"]; diff --git a/nixarr/bazarr/default.nix b/nixarr/bazarr/default.nix index b364b0f..4cf00ee 100644 --- a/nixarr/bazarr/default.nix +++ b/nixarr/bazarr/default.nix @@ -104,27 +104,5 @@ in { } ]; }; - - services.nginx = mkIf cfg.vpn.enable { - enable = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - virtualHosts."127.0.0.1:${builtins.toString config.bazarr.listenPort}" = { - listen = [ - { - addr = "0.0.0.0"; - port = config.bazarr.listenPort; - } - ]; - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://192.168.15.1:${builtins.toString config.bazarr.listenPort}"; - }; - }; - }; }; } diff --git a/nixarr/jellyfin/default.nix b/nixarr/jellyfin/default.nix index de19ef1..e764de5 100644 --- a/nixarr/jellyfin/default.nix +++ b/nixarr/jellyfin/default.nix @@ -261,21 +261,6 @@ in }; }; }) - (mkIf cfg.vpn.enable { - virtualHosts."127.0.0.1:${builtins.toString defaultPort}" = mkIf cfg.vpn.enable { - listen = [ - { - addr = "0.0.0.0"; - port = defaultPort; - } - ]; - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://192.168.15.1:${builtins.toString defaultPort}"; - }; - }; - }) (mkIf cfg.expose.vpn.enable { virtualHosts."${builtins.toString cfg.expose.vpn.accessibleFrom}:${builtins.toString cfg.expose.vpn.port}" = { enableACME = true; diff --git a/nixarr/lidarr/default.nix b/nixarr/lidarr/default.nix index e987b5c..b5a1d30 100644 --- a/nixarr/lidarr/default.nix +++ b/nixarr/lidarr/default.nix @@ -101,27 +101,5 @@ in { } ]; }; - - services.nginx = mkIf cfg.vpn.enable { - enable = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - virtualHosts."127.0.0.1:${builtins.toString defaultPort}" = { - listen = [ - { - addr = "0.0.0.0"; - port = defaultPort; - } - ]; - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://192.168.15.1:${builtins.toString defaultPort}"; - }; - }; - }; }; } diff --git a/nixarr/prowlarr/default.nix b/nixarr/prowlarr/default.nix index 8243082..d86dbf8 100644 --- a/nixarr/prowlarr/default.nix +++ b/nixarr/prowlarr/default.nix @@ -103,27 +103,5 @@ in { } ]; }; - - services.nginx = mkIf cfg.vpn.enable { - enable = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - virtualHosts."127.0.0.1:${builtins.toString defaultPort}" = { - listen = [ - { - addr = "0.0.0.0"; - port = defaultPort; - } - ]; - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://192.168.15.1:${builtins.toString defaultPort}"; - }; - }; - }; }; } diff --git a/nixarr/radarr/default.nix b/nixarr/radarr/default.nix index ddc41aa..90e1627 100644 --- a/nixarr/radarr/default.nix +++ b/nixarr/radarr/default.nix @@ -101,27 +101,5 @@ in { } ]; }; - - services.nginx = mkIf cfg.vpn.enable { - enable = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - virtualHosts."127.0.0.1:${builtins.toString defaultPort}" = { - listen = [ - { - addr = "0.0.0.0"; - port = defaultPort; - } - ]; - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://192.168.15.1:${builtins.toString defaultPort}"; - }; - }; - }; }; } diff --git a/nixarr/sabnzbd/default.nix b/nixarr/sabnzbd/default.nix index 09413a5..b266ccf 100644 --- a/nixarr/sabnzbd/default.nix +++ b/nixarr/sabnzbd/default.nix @@ -226,27 +226,5 @@ in { } ]; }; - - services.nginx = mkIf cfg.vpn.enable { - enable = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - virtualHosts."127.0.0.1:${builtins.toString cfg.guiPort}" = { - listen = [ - { - addr = "0.0.0.0"; - port = cfg.guiPort; - } - ]; - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://192.168.15.1:${builtins.toString cfg.guiPort}"; - }; - }; - }; }; } diff --git a/nixarr/sonarr/default.nix b/nixarr/sonarr/default.nix index cc8bd2f..c839f7f 100644 --- a/nixarr/sonarr/default.nix +++ b/nixarr/sonarr/default.nix @@ -101,27 +101,5 @@ in { } ]; }; - - services.nginx = mkIf cfg.vpn.enable { - enable = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - virtualHosts."127.0.0.1:${builtins.toString defaultPort}" = { - listen = [ - { - addr = "0.0.0.0"; - port = defaultPort; - } - ]; - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://192.168.15.1:${builtins.toString defaultPort}"; - }; - }; - }; }; } diff --git a/nixarr/transmission/default.nix b/nixarr/transmission/default.nix index eeabdc4..0d4118e 100644 --- a/nixarr/transmission/default.nix +++ b/nixarr/transmission/default.nix @@ -451,27 +451,5 @@ in { } ]; }; - - services.nginx = mkIf cfg.vpn.enable { - enable = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - virtualHosts."127.0.0.1:${builtins.toString cfg.uiPort}" = { - listen = [ - { - addr = "0.0.0.0"; - port = cfg.uiPort; - } - ]; - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://192.168.15.1:${builtins.toString cfg.uiPort}"; - }; - }; - }; }; }