diff --git a/.mikaela_install b/.mikaela_install index b668ebf3..71a98453 100755 --- a/.mikaela_install +++ b/.mikaela_install @@ -5,6 +5,7 @@ set -x # If the latest commit cannot be verified, exit to error. +echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers" git verify-commit HEAD || exit 1 # Place my personal more questionable aliases in place, except that I don't diff --git a/install b/install index b13e4769..bcc0d53f 100755 --- a/install +++ b/install @@ -6,6 +6,7 @@ set -x # If my allowed_signers are present, use them, if not, clone them, and try # again. The gitconfig expects them here. if [ -d ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers ]; then + echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers" git verify-commit HEAD || exit 1 sleep 3 else @@ -13,6 +14,7 @@ else # -vp - verbose, parent. This comment won't be repeated. mkdir -vp ~/src/gitea.blesmrt.net/Mikaela/ git clone https://gitea.blesmrt.net/Mikaela/ssh-allowed_signers.git ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers + echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers" git verify-commit HEAD || exit 1 sleep 3 fi diff --git a/rc/bashrc b/rc/bashrc index a25a3473..3c559f11 100755 --- a/rc/bashrc +++ b/rc/bashrc @@ -747,9 +747,10 @@ function shell-things { echo "shell-things: $SHELL_THINGS_REPO exists, git pulling..." echo "" cd $SHELL_THINGS_REPO - git remote set-url origin https://gitea.blesmrt.net/Mikaela/shell-things.git + git remote set-url origin https://codeberg.org/Aminda/shell-things.git git fetch --all git pull + echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers" git verify-commit HEAD || exit 1 sleep 10 echo "" @@ -760,7 +761,7 @@ function shell-things { echo "" echo "shell-things: $SHELL_THINGS_REPO doesn't exist, cloning..." echo "" - git clone https://gitea.blesmrt.net/Mikaela/shell-things.git $SHELL_THINGS_REPO + git clone https://codeberg.org/Aminda/shell-things.git $SHELL_THINGS_REPO cd $SHELL_THINGS_REPO sleep 10 echo "" @@ -903,7 +904,7 @@ myip6() { # Easier verifying of SSH signed files: ssh-verify-file whatever@mikaela.info file.txt # It's assumed that signature of file.txt is called as file.txt.sig -sshAllowedSigners=$HOME/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers +sshAllowedSigners=$HOME/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers ssh-verify-file() { echo "$1 ${2:?Usage: ssh-verify-file }" > /dev/null ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig < $2 diff --git a/rc/zshrc b/rc/zshrc index 469878b3..b2789217 100755 --- a/rc/zshrc +++ b/rc/zshrc @@ -733,9 +733,10 @@ function shell-things { echo "shell-things: $SHELL_THINGS_REPO exists, git pulling..." echo "" cd $SHELL_THINGS_REPO - git remote set-url origin https://gitea.blesmrt.net/Mikaela/shell-things.git + git remote set-url origin https://codeberg.org/Aminda/shell-things.git git fetch --all git pull + echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers" git verify-commit HEAD || exit 1 sleep 10 echo "" @@ -746,7 +747,7 @@ function shell-things { echo "" echo "shell-things: $SHELL_THINGS_REPO doesn't exist, cloning..." echo "" - git clone https://gitea.blesmrt.net/Mikaela/shell-things.git $SHELL_THINGS_REPO + git clone https://codeberg.org/Aminda/shell-things.git $SHELL_THINGS_REPO cd $SHELL_THINGS_REPO sleep 10 echo "" @@ -889,7 +890,7 @@ myip6() { # Easier verifying of SSH signed files: ssh-verify-file whatever@mikaela.info file.txt # It's assumed that signature of file.txt is called as file.txt.sig -sshAllowedSigners=$HOME/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers +sshAllowedSigners=$HOME/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers ssh-verify-file() { echo "$1 ${2:?Usage: ssh-verify-file }" > /dev/null ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig < $2