JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #102376 from felschr/feat/cfdyndns-password-file

Browse Source 
nixos/cfdyndns: add apikeyFile option
This commit is contained in:
Aaron Andersen 2020-11-10 18:08:25 -05:00 committed by GitHub
commit e419de361d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/modules/services/misc/cfdyndns.nix
View File

@ -6,6 +6,12 @@ let
cfg = config.services.cfdyndns; cfg = config.services.cfdyndns;
in in
{ {
imports = [
(mkRemovedOptionModule
[ "services" "cfdyndns" "apikey" ]
"Use services.cfdyndns.apikeyFile instead.")
];
options = { options = {
services.cfdyndns = { services.cfdyndns = {
enable = mkEnableOption "Cloudflare Dynamic DNS Client"; enable = mkEnableOption "Cloudflare Dynamic DNS Client";
@ -17,10 +23,12 @@ in
''; '';
}; };
apikey = mkOption { apikeyFile = mkOption {
type = types.str; default = null;
type = types.nullOr types.str;
description = '' description = ''
The API Key to use to authenticate to CloudFlare. The path to a file containing the API Key
used to authenticate with CloudFlare.
''; '';
}; };
@ -45,13 +53,17 @@ in
Type = "simple"; Type = "simple";
User = config.ids.uids.cfdyndns; User = config.ids.uids.cfdyndns;
Group = config.ids.gids.cfdyndns; Group = config.ids.gids.cfdyndns;
ExecStart = "/bin/sh -c '${pkgs.cfdyndns}/bin/cfdyndns'";
}; };
environment = { environment = {
CLOUDFLARE_EMAIL="${cfg.email}"; CLOUDFLARE_EMAIL="${cfg.email}";
CLOUDFLARE_APIKEY="${cfg.apikey}";
CLOUDFLARE_RECORDS="${concatStringsSep "," cfg.records}"; CLOUDFLARE_RECORDS="${concatStringsSep "," cfg.records}";
}; };
script = ''
${optionalString (cfg.apikeyFile != null) ''
export CLOUDFLARE_APIKEY="$(cat ${escapeShellArg cfg.apikeyFile})"
''}
${pkgs.cfdyndns}/bin/cfdyndns
'';
}; };
users.users = { users.users = {