Compare commits
2 Commits
a57570ce80
...
1facd8a764
| Author | SHA1 | Date | |
|---|---|---|---|
| 1facd8a764 | |||
| 8ced6a530c |
@@ -236,6 +236,7 @@ let
|
||||
curl = "${pkgs.curl}/bin/curl";
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
grep = "${pkgs.gnugrep}/bin/grep";
|
||||
awk = "${pkgs.gawk}/bin/awk";
|
||||
|
||||
mkDownloadClientPayload =
|
||||
dc:
|
||||
@@ -365,26 +366,28 @@ let
|
||||
|
||||
enabledInstances = lib.filterAttrs (_: inst: inst.enable) cfg;
|
||||
|
||||
mkBazarrProviderSection = type: provider: ''
|
||||
mkBazarrProviderSection = type: provider:
|
||||
let
|
||||
ltype = lib.toLower type;
|
||||
in ''
|
||||
# ${type} provider
|
||||
echo "Checking ${type} provider..."
|
||||
PROVIDER_API_KEY=$(${grep} -oP '(?<=<ApiKey>)[^<]+' ${lib.escapeShellArg "${provider.dataDir}/config.xml"})
|
||||
EXISTING=$(${curl} -sf "$BASE_URL/api/${lib.toLower type}" -H "X-API-KEY: $API_KEY")
|
||||
if echo "$EXISTING" | ${jq} -e '. | length > 0' > /dev/null 2>&1; then
|
||||
EXISTING=$(${curl} -sf "$BASE_URL/api/system/settings" -H "X-API-KEY: $API_KEY")
|
||||
USE_FLAG=$(echo "$EXISTING" | ${jq} -r '.general.use_${ltype}')
|
||||
EXISTING_KEY=$(echo "$EXISTING" | ${jq} -r '.${ltype}.apikey // ""')
|
||||
if [ "$USE_FLAG" = "true" ] && [ -n "$EXISTING_KEY" ]; then
|
||||
echo "${type} provider already configured, skipping"
|
||||
else
|
||||
echo "Adding ${type} provider..."
|
||||
PAYLOAD=$(${jq} -n \
|
||||
--arg ip "localhost" \
|
||||
--argjson port ${builtins.toString provider.port} \
|
||||
--arg apikey "$PROVIDER_API_KEY" \
|
||||
--argjson ssl false \
|
||||
--arg base_url "/" \
|
||||
'{ip: $ip, port: $port, apikey: $apikey, ssl: $ssl, base_url: $base_url}')
|
||||
${curl} -sf -X POST "$BASE_URL/api/${lib.toLower type}" \
|
||||
${curl} -sf -X POST "$BASE_URL/api/system/settings" \
|
||||
-H "X-API-KEY: $API_KEY" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$PAYLOAD"
|
||||
-d "settings-general-use_${ltype}=true" \
|
||||
-d "settings-${ltype}-ip=localhost" \
|
||||
-d "settings-${ltype}-port=${builtins.toString provider.port}" \
|
||||
-d "settings-${ltype}-apikey=$PROVIDER_API_KEY" \
|
||||
-d "settings-${ltype}-ssl=false" \
|
||||
-d "settings-${ltype}-base_url=/"
|
||||
echo "${type} provider added"
|
||||
fi
|
||||
'';
|
||||
@@ -392,14 +395,14 @@ let
|
||||
mkBazarrInitScript = pkgs.writeShellScript "bazarr-init" ''
|
||||
set -euo pipefail
|
||||
|
||||
CONFIG_INI="${bazarrCfg.dataDir}/config/config.ini"
|
||||
CONFIG_YAML="${bazarrCfg.dataDir}/config/config.yaml"
|
||||
|
||||
if [ ! -f "$CONFIG_INI" ]; then
|
||||
echo "Config file $CONFIG_INI not found, skipping bazarr init"
|
||||
if [ ! -f "$CONFIG_YAML" ]; then
|
||||
echo "Config file $CONFIG_YAML not found, skipping bazarr init"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
API_KEY=$(${grep} -oP '(?<=apikey = )[^\n]+' "$CONFIG_INI")
|
||||
API_KEY=$(${awk} '/^auth:/{f=1} f && /apikey:/{gsub(/.*apikey: /, ""); print; exit}' "$CONFIG_YAML")
|
||||
BASE_URL="http://localhost:${builtins.toString bazarrCfg.port}"
|
||||
|
||||
# Wait for API to become available
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
services.bazarrInit = {
|
||||
enable = true;
|
||||
dataDir = service_configs.bazarr.dataDir;
|
||||
dataDir = "/var/lib/bazarr";
|
||||
port = service_configs.ports.bazarr;
|
||||
sonarr = {
|
||||
enable = true;
|
||||
|
||||
@@ -124,6 +124,11 @@ testPkgs.testers.runNixOSTest {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
services.bazarr = {
|
||||
enable = true;
|
||||
listenPort = 6767;
|
||||
};
|
||||
|
||||
services.arrInit.sonarr = {
|
||||
enable = true;
|
||||
serviceName = "sonarr";
|
||||
@@ -217,6 +222,24 @@ testPkgs.testers.runNixOSTest {
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.bazarrInit = {
|
||||
enable = true;
|
||||
dataDir = "/var/lib/bazarr";
|
||||
port = 6767;
|
||||
sonarr = {
|
||||
enable = true;
|
||||
dataDir = "/var/lib/sonarr/.config/NzbDrone";
|
||||
port = 8989;
|
||||
serviceName = "sonarr";
|
||||
};
|
||||
radarr = {
|
||||
enable = true;
|
||||
dataDir = "/var/lib/radarr/.config/Radarr";
|
||||
port = 7878;
|
||||
serviceName = "radarr";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
@@ -228,6 +251,7 @@ testPkgs.testers.runNixOSTest {
|
||||
machine.wait_for_unit("sonarr.service")
|
||||
machine.wait_for_unit("radarr.service")
|
||||
machine.wait_for_unit("prowlarr.service")
|
||||
machine.wait_for_unit("bazarr.service")
|
||||
|
||||
# Wait for Sonarr API to be ready (config.xml is auto-generated on first start)
|
||||
machine.wait_until_succeeds(
|
||||
@@ -350,5 +374,46 @@ testPkgs.testers.runNixOSTest {
|
||||
"jq '. | length'"
|
||||
).strip()
|
||||
assert result == "2", f"Expected 2 Prowlarr synced apps, got {result}"
|
||||
|
||||
# Wait for Bazarr to generate config.yaml
|
||||
machine.wait_until_succeeds(
|
||||
"test -f /var/lib/bazarr/config/config.yaml",
|
||||
timeout=120,
|
||||
)
|
||||
|
||||
# Wait for Bazarr API to be ready
|
||||
machine.wait_until_succeeds(
|
||||
"API_KEY=$(awk '/^auth:/{f=1} f && /apikey:/{gsub(/.*apikey: /, \"\"); print; exit}' /var/lib/bazarr/config/config.yaml) && "
|
||||
"curl -sf http://localhost:6767/api/system/status -H \"X-API-KEY: $API_KEY\"",
|
||||
timeout=120,
|
||||
)
|
||||
|
||||
# Restart bazarr-init now that config.yaml exists
|
||||
machine.succeed("systemctl restart bazarr-init.service")
|
||||
machine.wait_for_unit("bazarr-init.service")
|
||||
|
||||
# Verify Sonarr provider configured in Bazarr
|
||||
machine.succeed(
|
||||
"API_KEY=$(awk '/^auth:/{f=1} f && /apikey:/{gsub(/.*apikey: /, \"\"); print; exit}' /var/lib/bazarr/config/config.yaml) && "
|
||||
"curl -sf http://localhost:6767/api/system/settings -H \"X-API-KEY: $API_KEY\" | "
|
||||
"jq -e '.general.use_sonarr == true and (.sonarr.apikey // \"\") != \"\"'"
|
||||
)
|
||||
|
||||
# Verify Radarr provider configured in Bazarr
|
||||
machine.succeed(
|
||||
"API_KEY=$(awk '/^auth:/{f=1} f && /apikey:/{gsub(/.*apikey: /, \"\"); print; exit}' /var/lib/bazarr/config/config.yaml) && "
|
||||
"curl -sf http://localhost:6767/api/system/settings -H \"X-API-KEY: $API_KEY\" | "
|
||||
"jq -e '.general.use_radarr == true and (.radarr.apikey // \"\") != \"\"'"
|
||||
)
|
||||
|
||||
# Idempotency: restart bazarr-init and verify no duplicate config
|
||||
machine.succeed("systemctl restart bazarr-init.service")
|
||||
machine.wait_for_unit("bazarr-init.service")
|
||||
|
||||
machine.succeed(
|
||||
"API_KEY=$(awk '/^auth:/{f=1} f && /apikey:/{gsub(/.*apikey: /, \"\"); print; exit}' /var/lib/bazarr/config/config.yaml) && "
|
||||
"curl -sf http://localhost:6767/api/system/settings -H \"X-API-KEY: $API_KEY\" | "
|
||||
"jq -e '.general.use_sonarr == true and (.sonarr.apikey // \"\") != \"\"'"
|
||||
)
|
||||
'';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user