[bin] Update rekey to auto commit
This commit is contained in:
@ -9,8 +9,6 @@ mkdir -p "$SSH_DIR"
|
|||||||
PASS_PATH="personal/ssh/$USER@$HOST/$DATE"
|
PASS_PATH="personal/ssh/$USER@$HOST/$DATE"
|
||||||
|
|
||||||
DOTFILES_DIR="$HOME/.dotfiles"
|
DOTFILES_DIR="$HOME/.dotfiles"
|
||||||
DOT_SSH_DIR="$DOTFILES_DIR/.ssh"
|
|
||||||
PASS_STORE_DIR="$DOTFILES_DIR/.password-store"
|
|
||||||
COMMIT_MSG="[ssh] Rekey host $HOST"
|
COMMIT_MSG="[ssh] Rekey host $HOST"
|
||||||
|
|
||||||
# --- Temporary directory for private key (macOS compatible) ---
|
# --- Temporary directory for private key (macOS compatible) ---
|
||||||
@ -44,22 +42,19 @@ chmod 600 "$SSH_DIR/$USER@$HOST.pub" 2>/dev/null || true
|
|||||||
echo "Public key written to $SSH_DIR/$USER@$HOST.pub"
|
echo "Public key written to $SSH_DIR/$USER@$HOST.pub"
|
||||||
|
|
||||||
# Temp key removed automatically by trap
|
# Temp key removed automatically by trap
|
||||||
mkdir -p "$DOT_SSH_DIR"
|
cat "$SSH_DIR/$USER@$HOST.pub" >> ~/.ssh/authorized_keys
|
||||||
cp "$PUB_KEY_PATH" "$DOT_SSH_DIR/"
|
echo "Public key added to authorized_keys"
|
||||||
echo "Public key copied to dotfiles: $DOT_SSH_DIR"
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
# Git commit dotfiles changes (ssh + password-store)
|
# Git commit dotfiles changes (ssh + password-store)
|
||||||
# ------------------------------------------------------------------
|
# ------------------------------------------------------------------
|
||||||
|
|
||||||
DOTFILES_DIR="$HOME/.dotfiles"
|
|
||||||
COMMIT_MSG="[ssh] Rekey host $HOST"
|
COMMIT_MSG="[ssh] Rekey host $HOST"
|
||||||
|
|
||||||
if [[ -d "$DOTFILES_DIR/.git" ]]; then
|
if [[ -d "$DOTFILES_DIR/.git" ]]; then
|
||||||
pushd "$DOTFILES_DIR" >/dev/null
|
pushd "$DOTFILES_DIR" >/dev/null
|
||||||
|
|
||||||
# Stage only relevant dirs
|
# Stage only relevant dirs
|
||||||
git add .ssh .password-store 2>/dev/null || true
|
git add ssh password-store 2>/dev/null || true
|
||||||
|
|
||||||
if ! git diff --cached --quiet; then
|
if ! git diff --cached --quiet; then
|
||||||
git commit -m "$COMMIT_MSG"
|
git commit -m "$COMMIT_MSG"
|
||||||
|
|||||||
Reference in New Issue
Block a user