diff --git a/backup.sh b/backup.sh index 5c6e6c9..f9ee814 100755 --- a/backup.sh +++ b/backup.sh @@ -17,6 +17,8 @@ export GNUPGHOME="$(mktemp -d)" bucket="${1}" ; shift name="${1}" ; shift backup_sources_file="${1}" ; shift +gpg_pubkey_file="${1}" ; shift +gpg_pubkey_id="${1}" ; shift declare -a backup_sources readarray backup_sources < "${backup_sources_file}" @@ -39,7 +41,7 @@ tmpgpg() { "${@}" } -tmpgpg --import "${dir}/pubkey.asc" +tmpgpg --import "${gpg_pubkey_file}" tmpgpg -k timestamp="$(date --utc -Iseconds)" @@ -85,7 +87,7 @@ for backup_dir in "${backup_sources[@]}" ; do | tmpgpg \ --output - \ --encrypt \ - --recipient 0x078A167A8741BD30 \ + --recipient "${gpg_pubkey_id}" \ | aws \ s3 cp \ - \ diff --git a/pubkey.asc b/pubkey.asc deleted file mode 100644 index 02f28a9..0000000 --- a/pubkey.asc +++ /dev/null @@ -1,84 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=oOXa ------END PGP PUBLIC KEY BLOCK-----