Merge pull request #476 from drduh/wip-16mar25

update config urls
This commit is contained in:
drduh 2025-03-17 15:44:36 +00:00 committed by GitHub
commit 466649f728
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -272,17 +272,17 @@ sudo dnf install \
Create a temporary directory which will be cleared on [reboot](https://en.wikipedia.org/wiki/Tmpfs) and set it as the GnuPG directory:
```console
export GNUPGHOME=$(mktemp -d -t gnupg-$(date +%Y-%m-%d)-XXXXXXXXXX)
export GNUPGHOME=$(mktemp -d -t $(date +%Y.%m.%d)-XXXX)
```
## Configuration
Import or create a [hardened configuration](https://github.com/drduh/config/blob/master/gpg.conf):
Import or create a [hardened configuration](https://github.com/drduh/config/blob/main/gpg.conf):
```console
cd $GNUPGHOME
wget https://raw.githubusercontent.com/drduh/config/master/gpg.conf
wget https://raw.githubusercontent.com/drduh/config/main/gpg.conf
```
The options will look similar to:
@ -934,12 +934,12 @@ Initialize GnuPG:
gpg -k
```
Import or create a [hardened configuration](https://github.com/drduh/config/blob/master/gpg.conf):
Import or create a [hardened configuration](https://github.com/drduh/config/blob/main/gpg.conf):
```console
cd ~/.gnupg
wget https://raw.githubusercontent.com/drduh/config/master/gpg.conf
wget https://raw.githubusercontent.com/drduh/config/main/gpg.conf
```
Set the following option. This avoids the problem where GnuPG will repeatedly prompt for the insertion of an already-inserted YubiKey:
@ -1094,7 +1094,7 @@ echo "test message string" | \
--output encrypted.txt
```
Use a [shell function](https://github.com/drduh/config/blob/master/zshrc) to make encrypting files easier:
Use a [shell function](https://github.com/drduh/config/blob/main/zshrc) to make encrypting files easier:
```console
secret () {
@ -1193,12 +1193,12 @@ YubiKey will blink when it is waiting for a touch. On Linux, [maximbaz/yubikey-t
## SSH
Import or create a [hardened configuration](https://github.com/drduh/config/blob/master/gpg-agent.conf):
Import or create a [hardened configuration](https://github.com/drduh/config/blob/main/gpg-agent.conf):
```console
cd ~/.gnupg
wget https://raw.githubusercontent.com/drduh/config/master/gpg-agent.conf
wget https://raw.githubusercontent.com/drduh/config/main/gpg-agent.conf
```
**Important** The `cache-ttl` options do **not** apply when using YubiKey as a smart card, because the PIN is [cached by the smart card itself](https://dev.gnupg.org/T3362). To clear the PIN from cache (equivalent to `default-cache-ttl` and `max-cache-ttl`), remove YubiKey, or set `forcesig` when editing the card to be prompted for the PIN each time.
@ -1849,14 +1849,12 @@ sudo mkdir /mnt/public
sudo mount /dev/sdc2 /mnt/public
```
Copy the original private key materials to a temporary working directory:
Copy the original private key materials (after updating the encrypted storage directory name) to a temporary working directory:
```console
export GNUPGHOME=$(mktemp -d -t gnupg-$(date +%Y-%m-%d)-XXXXXXXXXX)
export GNUPGHOME=$(mktemp -d -t $(date +%Y.%m.%d)-XXXX)
cd $GNUPGHOME
cp -avi /mnt/encrypted-storage/gnupg-*/* $GNUPGHOME
cp -avi /mnt/encrypted-storage/2025.12.31-AbCd/* $GNUPGHOME/
```
Confirm the identity is available, set the key id and fingerprint: