diff options
Diffstat (limited to 'modules/apps')
| -rw-r--r-- | modules/apps/filebackup.nix | 6 | ||||
| -rw-r--r-- | modules/apps/mysqlbackup.nix | 6 | ||||
| -rw-r--r-- | modules/apps/pgbackup.nix | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/modules/apps/filebackup.nix b/modules/apps/filebackup.nix index ec3d84d..badc707 100644 --- a/modules/apps/filebackup.nix +++ b/modules/apps/filebackup.nix @@ -17,9 +17,9 @@ let gpgPubKeys = flatten [ cfg.encrypt ]; gpg = "${pkgs.gpg}/bin/gpg2"; - pubring = pkgs.runCommand "pubring.gpg" {} '' + pubring = pkgs.runCommand "pubring.kbx" {} '' ${gpg} --homedir . --import ${toString gpgPubKeys} - cp pubring.gpg $out + cp pubring.kbx $out ''; default = d: t: mkOption { type = t; default = d; }; @@ -175,7 +175,7 @@ let ${optionalString (gpgPubKeys != []) '' # shellcheck disable=SC2174 mkdir --mode=0700 -p '${privateDir}/gnupg' - ln -sf ${pubring} '${privateDir}/gnupg/pubring.gpg' + ln -sf ${pubring} '${privateDir}/gnupg/pubring.kbx' ''} failed=0 diff --git a/modules/apps/mysqlbackup.nix b/modules/apps/mysqlbackup.nix index e7d81eb..5ab0f74 100644 --- a/modules/apps/mysqlbackup.nix +++ b/modules/apps/mysqlbackup.nix @@ -15,9 +15,9 @@ let gpgPubKeys = flatten [ cfg.encrypt ]; gpg = "${pkgs.gpg}/bin/gpg2"; - pubring = pkgs.runCommand "pubring.gpg" {} '' + pubring = pkgs.runCommand "pubring.kbx" {} '' ${gpg} --homedir . --import ${toString gpgPubKeys} - cp pubring.gpg $out + cp pubring.kbx $out ''; default = d: t: mkOption { type = t; default = d; }; @@ -287,7 +287,7 @@ let ${optionalString (gpgPubKeys != []) '' # shellcheck disable=SC2174 mkdir --mode=0700 -p '${privateDir}/gnupg' - ln -sf ${pubring} '${privateDir}/gnupg/pubring.gpg' + ln -sf ${pubring} '${privateDir}/gnupg/pubring.kbx' ''} ${concatStringsSep "\n" ( diff --git a/modules/apps/pgbackup.nix b/modules/apps/pgbackup.nix index 7f7c7ca..099fe35 100644 --- a/modules/apps/pgbackup.nix +++ b/modules/apps/pgbackup.nix @@ -17,9 +17,9 @@ let gpgPubKeys = flatten [ cfg.encrypt ]; gpg = "${pkgs.gpg}/bin/gpg2"; - pubring = pkgs.runCommand "pubring.gpg" {} '' + pubring = pkgs.runCommand "pubring.kbx" {} '' ${gpg} --homedir . --import ${toString gpgPubKeys} - cp pubring.gpg $out + cp pubring.kbx $out ''; default = d: t: mkOption { type = t; default = d; }; @@ -224,7 +224,7 @@ let ${optionalString (gpgPubKeys != []) '' # shellcheck disable=SC2174 mkdir --mode=0700 -p '${privateDir}/gnupg' - ln -sf ${pubring} '${privateDir}/gnupg/pubring.gpg' + ln -sf ${pubring} '${privateDir}/gnupg/pubring.kbx' ''} failed=0 |