diff --git a/devices/cluster/modules/caddy.nix b/devices/cluster/modules/caddy.nix index 065e90b..c5dc616 100644 --- a/devices/cluster/modules/caddy.nix +++ b/devices/cluster/modules/caddy.nix @@ -125,10 +125,6 @@ in { subDirectories = { bazarr.reverseProxy = "${nosIP}:6767"; - bazarr-french = { - subDirName = "bafrr"; - reverseProxy = "${nosIP}:6766"; - }; prowlarr.reverseProxy = "${nosIP}:9696"; radarr.reverseProxy = "${nosIP}:7878"; diff --git a/devices/nos/default.nix b/devices/nos/default.nix index 2d82968..0280e14 100644 --- a/devices/nos/default.nix +++ b/devices/nos/default.nix @@ -13,8 +13,7 @@ in { ./modules/mergerfs.nix ./modules/qbittorrent ./modules/snapraid.nix - ./modules/subtitles/cleanup.nix - ./modules/subtitles/syncing.nix + ./modules/subtitles ]; vars = { diff --git a/devices/nos/modules/arion/homepage/services.nix b/devices/nos/modules/arion/homepage/services.nix index 370e111..a3e0359 100644 --- a/devices/nos/modules/arion/homepage/services.nix +++ b/devices/nos/modules/arion/homepage/services.nix @@ -155,18 +155,6 @@ }; }; } - { - "bazarr french" = rec { - href = "https://lan.nelim.org/bafrr"; - icon = "bazarr.png"; - description = "fetches subs"; - widget = { - type = "bazarr"; - url = href; - key = "{{HOMEPAGE_VAR_BAZARRFR_API}}"; - }; - }; - } { prowlarr = rec { href = "https://lan.nelim.org/prowlarr"; diff --git a/devices/nos/modules/arion/media/bazarr/compose.nix b/devices/nos/modules/arion/media/bazarr/compose.nix index d7b9c15..7b83bde 100644 --- a/devices/nos/modules/arion/media/bazarr/compose.nix +++ b/devices/nos/modules/arion/media/bazarr/compose.nix @@ -3,55 +3,28 @@ rwPath = rwDataDir + "/media/bazarr"; in { - arion.projects."bazarr" = { - "bazarr" = { - image = ./images/bazarr.nix; - restart = "always"; + arion.projects."bazarr"."bazarr" = { + image = ./images/bazarr.nix; + restart = "always"; - environment = { - PUID = "1000"; - PGID = "1000"; - TZ = "America/New_York"; - }; - - extra_hosts = ["lan.nelim.org=10.0.0.130"]; - ports = [ - "6767:6767" - ]; - - volumes = [ - "${rwPath}/data:/config" - "/data:/data" - ]; - - extraOptions = { - deploy.resources.limits.cpus = "0.5"; - }; + environment = { + PUID = "1000"; + PGID = "1000"; + TZ = "America/New_York"; }; - "bazarr-fr" = { - image = ./images/bazarr.nix; - restart = "always"; + extra_hosts = ["lan.nelim.org=10.0.0.130"]; + ports = [ + "6767:6767" + ]; - environment = { - PUID = "1000"; - PGID = "1000"; - TZ = "America/New_York"; - }; + volumes = [ + "${rwPath}/data:/config" + "/data:/data" + ]; - extra_hosts = ["lan.nelim.org=10.0.0.130"]; - ports = [ - "6766:6767" - ]; - - volumes = [ - "${rwPath}/data-fr:/config" - "/data:/data" - ]; - - extraOptions = { - deploy.resources.limits.cpus = "0.5"; - }; + extraOptions = { + deploy.resources.limits.cpus = "2"; }; }; } diff --git a/devices/nos/modules/subtitles/default.nix b/devices/nos/modules/subtitles/default.nix new file mode 100644 index 0000000..3fd3451 --- /dev/null +++ b/devices/nos/modules/subtitles/default.nix @@ -0,0 +1,6 @@ +{...}: { + imports = [ + ./cleanup.nix + ./syncing.nix + ]; +} diff --git a/devices/nos/modules/subtitles/syncing.nix b/devices/nos/modules/subtitles/syncing.nix index 6f66ea8..1df7ca9 100644 --- a/devices/nos/modules/subtitles/syncing.nix +++ b/devices/nos/modules/subtitles/syncing.nix @@ -22,13 +22,6 @@ in { exec ${lib.getExe bbPkg} --config ${config.sops.secrets.bazarr-bulk.path} "$@" ''; }) - - (pkgs.writeShellApplication { - name = "bb-fr"; - text = '' - exec ${lib.getExe bbPkg} --config ${config.sops.secrets.bazarr-bulk-fr.path} "$@" - ''; - }) ]; systemd = { diff --git a/flake.lock b/flake.lock index 8f37774..20e29d2 100644 --- a/flake.lock +++ b/flake.lock @@ -122,16 +122,15 @@ ] }, "locked": { - "lastModified": 1715912570, - "narHash": "sha256-Fyxsn7OLo8dHtKGKc1PcirQBBbQTD6tzHDDedEYlXnQ=", + "lastModified": 1716002154, + "narHash": "sha256-dsjUnHsumQIfZ/HqWizx1wQkCqQXL0LzT8DOKqMWeVA=", "owner": "matt1432", "repo": "bazarr-bulk", - "rev": "81be58cff86f0ef525735dfe9cdf7f899ae75899", + "rev": "bf8dc575ea39c64fa6b0261cb760094c1cdca754", "type": "github" }, "original": { "owner": "matt1432", - "ref": "nix", "repo": "bazarr-bulk", "type": "github" } @@ -2003,11 +2002,11 @@ ] }, "locked": { - "lastModified": 1715913475, - "narHash": "sha256-omx63Z5ZnK/tWz5Uz7/XWGzKpDKWgpVZa5paYB2iFao=", + "lastModified": 1716003430, + "narHash": "sha256-QPW2z616smURIQmOIzfRUCBkbHDCDAn38SDB9WiObTs=", "ref": "refs/heads/main", - "rev": "015f7916d2f8bbb461850ee765933e4ca66f8a23", - "revCount": 62, + "rev": "acfa72202dd120c9ab82eb5507369d4a0a373079", + "revCount": 65, "type": "git", "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets" }, diff --git a/flake.nix b/flake.nix index bf1e5c3..f5d5fc1 100644 --- a/flake.nix +++ b/flake.nix @@ -245,7 +245,6 @@ type = "github"; owner = "matt1432"; repo = "bazarr-bulk"; - ref = "nix"; inputs.nixpkgs.follows = "nixpkgs"; };