From 112cead812178c262ab7fa2d9a0860348c7afc74 Mon Sep 17 00:00:00 2001 From: Alexander Hess Date: Mon, 21 Sep 2026 21:15:53 +0200 Subject: [PATCH] Name snapshots by full date instead of just year Snapshots are now written as -public_YYYY-MM-DD.asc, one file per ceremony, matching the naming of the secret exports kept outside this repository --- OPENPGP.md | 5 ++--- OPENPGP.md.asc | 8 ++++---- README.md | 2 +- scripts/snapshot.sh | 14 +++++++------- ....asc => 75681C8167312680-public_2026-07-08.asc} | 0 5 files changed, 14 insertions(+), 15 deletions(-) rename snapshots/{75681C8167312680-public-2026.asc => 75681C8167312680-public_2026-07-08.asc} (100%) diff --git a/OPENPGP.md b/OPENPGP.md index 7ab9798..70e50c2 100644 --- a/OPENPGP.md +++ b/OPENPGP.md @@ -71,9 +71,8 @@ gpg --verify OPENPGP.md.asc OPENPGP.md such as the 2026 supersession and the `age` key introduction - `history/`, armored exports of all retired keys, see [Key History](#key-history) below - - `snapshots/-public-YYYY.asc`, - refreshed at every ceremony, - one file per year, + - `snapshots/-public_YYYY-MM-DD.asc`, + one file per ceremony, written by `scripts/snapshot.sh` - One commit per ceremony to keep snapshot, updated tables, diff --git a/OPENPGP.md.asc b/OPENPGP.md.asc index 0bc61f9..d87b19d 100644 --- a/OPENPGP.md.asc +++ b/OPENPGP.md.asc @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNATURE----- -iHUEABYKAB0WIQTW0Zid8fayP9d2KT20bttN/CaAXQUCarGDIgAKCRC0bttN/CaA -XYaFAP92QJ2JOCVI5L0SgWwnE2p9wbr19jmwa4bLpe8jjDWM1AD+KmUPYusOcWu0 -BtCjSOPVI5P0S390W67K12LOzI/vOAY= -=q3oD +iHUEABYKAB0WIQTW0Zid8fayP9d2KT20bttN/CaAXQUCarGDOQAKCRC0bttN/CaA +XbcdAQDDF3oKFFZQCw9dVLkf6ooaiS601qRyHHVGNPOkjfhmcwD/di5Wi6uTR3r+ +pqReqX1gST9JsNyGmL4pTti+ItwY3gk= +=p0SW -----END PGP SIGNATURE----- diff --git a/README.md b/README.md index 3bf6784..c255783 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ How I implement [OpenPGP](https://www.openpgp.org/): - [`security.txt`](security.txt): [RFC 9116](https://www.rfc-editor.org/info/rfc9116/) contact file, clearsigned, renewed at every ceremony - [`snapshots/`](snapshots/): - Yearly exports of the current OpenPGP key + Dated exports of the current OpenPGP key, one per ceremony - [`ceremonies/`](ceremonies/): Signed records of exceptional events - [`history/`](history/): diff --git a/scripts/snapshot.sh b/scripts/snapshot.sh index 793ccad..0fa90e7 100755 --- a/scripts/snapshot.sh +++ b/scripts/snapshot.sh @@ -1,12 +1,12 @@ #!/bin/sh -# Export the current OpenPGP public key as a yearly snapshot +# Export the current OpenPGP public key as a dated snapshot # -# Usage: ./scripts/snapshot.sh [YEAR] +# Usage: ./scripts/snapshot.sh [DATE] # -# YEAR defaults to the current UTC year +# DATE defaults to the current UTC date (YYYY-MM-DD) # -# Writes snapshots/-public-.asc and refreshes public-key.asc +# Writes snapshots/-public_.asc and refreshes public-key.asc set -eu @@ -16,7 +16,7 @@ SIGNING_KEY='D6D1989DF1F6B23FD776293DB46EDB4DFC26805D' REPO=$(cd "$(dirname "$0")/.." && pwd) -YEAR=${1:-$(date -u +%Y)} +DATE=${1:-$(date -u +%F)} # Notes: # - the first "fpr" line is the primary key's fingerprint @@ -30,7 +30,7 @@ fi # The last 16 hex chars, as used in OPENPGP.md KEYID=${FPR#"${FPR%????????????????}"} -OUT="$REPO/snapshots/$KEYID-public-$YEAR.asc" +OUT="$REPO/snapshots/${KEYID}-public_$DATE.asc" mkdir -p "$REPO/snapshots" @@ -69,4 +69,4 @@ cp "$OUT" "$REPO/public-key.asc" gpg --show-keys "$OUT" >&2 -echo "Wrote snapshots/$KEYID-public-$YEAR.asc and public-key.asc" +echo "Wrote snapshots/${KEYID}-public_$DATE.asc and public-key.asc" diff --git a/snapshots/75681C8167312680-public-2026.asc b/snapshots/75681C8167312680-public_2026-07-08.asc similarity index 100% rename from snapshots/75681C8167312680-public-2026.asc rename to snapshots/75681C8167312680-public_2026-07-08.asc