nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

invidious: use YAML configuration by default (#448476)

Browse Source 
(cherry picked from commit a22dc98a36)
This commit is contained in:
sadorowo
2025-10-05 13:17:12 +00:00
committed by github-actions[bot]
parent 03a83dc61d
commit a449de090f
1 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
nixos/modules/services/web-apps/invidious.nix
View File

@@ -7,11 +7,25 @@
}:
let
cfg = config.services.invidious;
# To allow injecting secrets with jq, json (instead of yaml) is used
settingsFormat = pkgs.formats.json { };
isNew = lib.versionAtLeast config.system.stateVersion "25.11";
inherit (lib) types;
settingsFile = settingsFormat.generate "invidious-settings" cfg.settings;
settingsFormat = pkgs.formats.yaml { };
yamlSettingsFile = settingsFormat.generate "invidious-settings" cfg.settings;
# This needs to stay here for backwards compatibility
# with pre-25.11 configs
convertSettings = file: lib.escapeShellArg (
if isNew then
file
else
pkgs.runCommand "converted-settings.yaml" {
nativeBuildInputs = [ pkgs.yq-go ];
} ''
${pkgs.yq-go}/bin/yq -o=yaml < ${lib.escapeShellArg file} > $out
''
);
generatedHmacKeyFile = "/var/lib/invidious/hmac_key";
generateHmac = cfg.hmacKeyFile == null;
@@ -59,6 +73,50 @@ let
RuntimeRandomizedExtraSec = lib.mkDefault "5min";
};
};
configScript = scaleIndex:
''
configParts=()
''
# autogenerated hmac_key
+ lib.optionalString generateHmac ''
configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")
''
# generated settings file
+ ''
configParts+=("$(< ${convertSettings yamlSettingsFile})")
''
# optional database password file
+ lib.optionalString (cfg.database.host != null) ''
configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${cfg.database.passwordFile})")
''
# optional extra settings file
+ lib.optionalString (cfg.extraSettingsFile != null) ''
configParts+=("$(< ${convertSettings cfg.extraSettingsFile})")
''
# explicitly specified hmac key file
+ lib.optionalString (cfg.hmacKeyFile != null) ''
configParts+=("$(< ${cfg.hmacKeyFile})")
''
# configure threads for secondary instances
+ lib.optionalString (scaleIndex > 0) ''
configParts+=('{"channel_threads":0, "feed_threads":0}')
''
# configure different ports for the instances
+ ''
configParts+=('{"port":${toString (cfg.port + scaleIndex)}}')
''
# merge all parts into a single configuration with later elements overriding previous elements
+ ''
export INVIDIOUS_CONFIG="$(${if isNew then
"${pkgs.yq-go}/bin/yq ea '. as $item ireduce ({}; . * $item)'"
else
"${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)'"
} <<<"''${configParts[*]}")"
exec ${cfg.package}/bin/invidious
'';
mkInvidiousService =
scaleIndex:
lib.foldl' lib.recursiveUpdate commonInvidousServiceConfig [
@@ -76,44 +134,7 @@ let
after = commonInvidousServiceConfig.after ++ [ "invidious.service" ];
wants = commonInvidousServiceConfig.wants ++ [ "invidious.service" ];
})
{
script = ''
configParts=()
''
# autogenerated hmac_key
+ lib.optionalString generateHmac ''
configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")
''
# generated settings file
+ ''
configParts+=("$(< ${lib.escapeShellArg settingsFile})")
''
# optional database password file
+ lib.optionalString (cfg.database.host != null) ''
configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${lib.escapeShellArg cfg.database.passwordFile})")
''
# optional extra settings file
+ lib.optionalString (cfg.extraSettingsFile != null) ''
configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})")
''
# explicitly specified hmac key file
+ lib.optionalString (cfg.hmacKeyFile != null) ''
configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})")
''
# configure threads for secondary instances
+ lib.optionalString (scaleIndex > 0) ''
configParts+=('{"channel_threads":0, "feed_threads":0}')
''
# configure different ports for the instances
+ ''
configParts+=('{"port":${toString (cfg.port + scaleIndex)}}')
''
# merge all parts into a single configuration with later elements overriding previous elements
+ ''
export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")"
exec ${cfg.package}/bin/invidious
'';
}
{ script = configScript scaleIndex; }
];
serviceConfig = {