feat(bazarr): only use one instance
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-05-18 00:04:26 -04:00
parent 9a57b0b425
commit 31a3cfcaca
8 changed files with 31 additions and 78 deletions

View file

@ -125,10 +125,6 @@ in {
subDirectories = { subDirectories = {
bazarr.reverseProxy = "${nosIP}:6767"; bazarr.reverseProxy = "${nosIP}:6767";
bazarr-french = {
subDirName = "bafrr";
reverseProxy = "${nosIP}:6766";
};
prowlarr.reverseProxy = "${nosIP}:9696"; prowlarr.reverseProxy = "${nosIP}:9696";
radarr.reverseProxy = "${nosIP}:7878"; radarr.reverseProxy = "${nosIP}:7878";

View file

@ -13,8 +13,7 @@ in {
./modules/mergerfs.nix ./modules/mergerfs.nix
./modules/qbittorrent ./modules/qbittorrent
./modules/snapraid.nix ./modules/snapraid.nix
./modules/subtitles/cleanup.nix ./modules/subtitles
./modules/subtitles/syncing.nix
]; ];
vars = { vars = {

View file

@ -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 { prowlarr = rec {
href = "https://lan.nelim.org/prowlarr"; href = "https://lan.nelim.org/prowlarr";

View file

@ -3,55 +3,28 @@
rwPath = rwDataDir + "/media/bazarr"; rwPath = rwDataDir + "/media/bazarr";
in { in {
arion.projects."bazarr" = { arion.projects."bazarr"."bazarr" = {
"bazarr" = { image = ./images/bazarr.nix;
image = ./images/bazarr.nix; restart = "always";
restart = "always";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "1000"; PGID = "1000";
TZ = "America/New_York"; 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";
};
}; };
"bazarr-fr" = { extra_hosts = ["lan.nelim.org=10.0.0.130"];
image = ./images/bazarr.nix; ports = [
restart = "always"; "6767:6767"
];
environment = { volumes = [
PUID = "1000"; "${rwPath}/data:/config"
PGID = "1000"; "/data:/data"
TZ = "America/New_York"; ];
};
extra_hosts = ["lan.nelim.org=10.0.0.130"]; extraOptions = {
ports = [ deploy.resources.limits.cpus = "2";
"6766:6767"
];
volumes = [
"${rwPath}/data-fr:/config"
"/data:/data"
];
extraOptions = {
deploy.resources.limits.cpus = "0.5";
};
}; };
}; };
} }

View file

@ -0,0 +1,6 @@
{...}: {
imports = [
./cleanup.nix
./syncing.nix
];
}

View file

@ -22,13 +22,6 @@ in {
exec ${lib.getExe bbPkg} --config ${config.sops.secrets.bazarr-bulk.path} "$@" 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 = { systemd = {

View file

@ -122,16 +122,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715912570, "lastModified": 1716002154,
"narHash": "sha256-Fyxsn7OLo8dHtKGKc1PcirQBBbQTD6tzHDDedEYlXnQ=", "narHash": "sha256-dsjUnHsumQIfZ/HqWizx1wQkCqQXL0LzT8DOKqMWeVA=",
"owner": "matt1432", "owner": "matt1432",
"repo": "bazarr-bulk", "repo": "bazarr-bulk",
"rev": "81be58cff86f0ef525735dfe9cdf7f899ae75899", "rev": "bf8dc575ea39c64fa6b0261cb760094c1cdca754",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "matt1432", "owner": "matt1432",
"ref": "nix",
"repo": "bazarr-bulk", "repo": "bazarr-bulk",
"type": "github" "type": "github"
} }
@ -2003,11 +2002,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715913475, "lastModified": 1716003430,
"narHash": "sha256-omx63Z5ZnK/tWz5Uz7/XWGzKpDKWgpVZa5paYB2iFao=", "narHash": "sha256-QPW2z616smURIQmOIzfRUCBkbHDCDAn38SDB9WiObTs=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "015f7916d2f8bbb461850ee765933e4ca66f8a23", "rev": "acfa72202dd120c9ab82eb5507369d4a0a373079",
"revCount": 62, "revCount": 65,
"type": "git", "type": "git",
"url": "ssh://git@git.nelim.org/matt1432/nixos-secrets" "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
}, },

View file

@ -245,7 +245,6 @@
type = "github"; type = "github";
owner = "matt1432"; owner = "matt1432";
repo = "bazarr-bulk"; repo = "bazarr-bulk";
ref = "nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };