diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2017-11-24 18:35:02 -0800 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2017-11-24 18:35:02 -0800 |
commit | 63add7275b72151af3d3269427edecc33343e1d1 (patch) | |
tree | 2844da8b4a7ca1b4df6e93f08c4cd36e8a10626a | |
parent | snapshots-create: use long keyid for signing. (diff) | |
download | mastermirror-scripts-63add7275b72151af3d3269427edecc33343e1d1.tar.gz mastermirror-scripts-63add7275b72151af3d3269427edecc33343e1d1.tar.bz2 mastermirror-scripts-63add7275b72151af3d3269427edecc33343e1d1.zip |
Move GPG key details to vars.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r-- | rsync-gen.vars | 10 | ||||
-rwxr-xr-x | snapshots-create.sh | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/rsync-gen.vars b/rsync-gen.vars index 5d202e9..351d39f 100644 --- a/rsync-gen.vars +++ b/rsync-gen.vars @@ -22,6 +22,16 @@ FINALDIR_changelogs="${BASE}/final/repo-gentoo-changelogs" UPLOAD="${BASE}/snapshots-final/" REPODIR="${BASE}/gentoo-repo-final" # GITDIR is a magic variable for Git +# GPG info +# Signing key for Snapshot +#SIGNKEYID_snapshot="886182289048D40B3C3BADDA6DC226AAD8BA32AA" +#SIGNKEYID_snapshot="4AC0D5FE8F9296BA6A060A2ABB1D301B7DDAD20D" +#SIGNKEYID_snapshot="AE5454F967B56AB09AE160640838C26E239C75C4" +SIGNKEYID_snapshot="DCD05B71EAB94199527F44ACDB6B8C1F96D8BF6D" +# Signing key for rsync +SIGNKEYID_rsync="${SIGNKEYID_snapshot}" + + # common function write_time_log() { echo "$1" >> ${TIMESLOG} diff --git a/snapshots-create.sh b/snapshots-create.sh index 4913759..5255a85 100755 --- a/snapshots-create.sh +++ b/snapshots-create.sh @@ -36,11 +36,7 @@ FILENAME="portage-${YESTERDAY}.tar.bz2" # Parallel compressors can use a LOT of cpu, be nice about it NICE="nice -n 10" -# GPG info -#SIGNKEYID="886182289048D40B3C3BADDA6DC226AAD8BA32AA" -#SIGNKEYID="4AC0D5FE8F9296BA6A060A2ABB1D301B7DDAD20D" -#SIGNKEYID="AE5454F967B56AB09AE160640838C26E239C75C4" -SIGNKEYID="DCD05B71EAB94199527F44ACDB6B8C1F96D8BF6D" +SIGNKEYID=${SIGNKEYID_snapshot} if [[ ! $(gpg -k | grep ${SIGNKEYID}) ]]; then echo "${SIGNKEYID} not imported! exiting" |