diff --git a/README.md b/README.md index 4a09173..805249b 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ a home media server as easy, and pain free, as possible. If you have problems or feedback, feel free to join [the discord](https://discord.gg/n9ga99KwWC). -Note that this is still in a somewhat alpha state, beware! +Note that this is still in a somewhat beta state, beware! - Bugs are around -- Options are still subject to change +- Options generally won't be changed, but I reserve the right - Some options are mostly untested The general format won't change however. If you do still use it, any feedback diff --git a/nixarr/nixarr.nix b/nixarr/nixarr.nix index ddbd1b0..3296762 100644 --- a/nixarr/nixarr.nix +++ b/nixarr/nixarr.nix @@ -300,6 +300,7 @@ in { '' cd "$(mktemp -d)" + # DNS information dig google.com # Print resolv.conf diff --git a/nixarr/transmission/default.nix b/nixarr/transmission/default.nix index d98eef3..b3a78f5 100644 --- a/nixarr/transmission/default.nix +++ b/nixarr/transmission/default.nix @@ -234,6 +234,17 @@ in { description = "Transmission web-UI port."; }; + credentialsFile = mkOption { + type = types.path; + description = '' + Path to a JSON file to be merged with the settings. + Useful to merge a file which is better kept out of the Nix store + to set secret config parameters like `rpc-password`. + ''; + default = "/dev/null"; + example = "/var/lib/secrets/transmission/settings.json"; + }; + extraSettings = mkOption { type = types.attrs; default = {}; @@ -339,6 +350,7 @@ in { package = pkgs.transmission_4; openRPCPort = cfg.openFirewall; openPeerPorts = cfg.openFirewall; + credentialsFile = cfg.credentialsFile; settings = { download-dir = downloadDir;