From 7955ef90036a891eaa625543fc008a90f19f289e Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Tue, 21 Feb 2023 10:16:12 +0200 Subject: [PATCH] .gitconfig: add a FINEID comment, unify gpg sections --- .mikaela/gitconfig | 9 +++++---- conf/gitconfig | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.mikaela/gitconfig b/.mikaela/gitconfig index a0c02dec..4247ad2d 100644 --- a/.mikaela/gitconfig +++ b/.mikaela/gitconfig @@ -1,6 +1,7 @@ [user] name = Aminda Suomalainen email = suomalainen+git@mikaela.info + # Email stored on my FINEID #email = suomalainen@mikaela.info # Aminda Suomalainen FINEID 20.12.2021-20.12.2026 signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM= @@ -57,14 +58,16 @@ [gpg] format = ssh #format = x509 +[gpg "ssh"] + allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers +#[gpg "x509"] +# program = gpgsm [tag] forceSignAnnotated = true [pull] ff = only [init] defaultBranch = cxefa -[gpg "ssh"] - allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers [advice] # I am not developing in detached head state, I generally want to compile # a specific version of a program and I know how to get out of it @@ -81,5 +84,3 @@ [lfs] setlockablereadonly = true locksverify = true -#[gpg "x509"] -# program = gpgsm diff --git a/conf/gitconfig b/conf/gitconfig index d6d00c9a..57c2fded 100644 --- a/conf/gitconfig +++ b/conf/gitconfig @@ -1,6 +1,7 @@ [user] #name = Aminda Suomalainen #email = suomalainen+git@mikaela.info + # Email stored on my FINEID #email = suomalainen@mikaela.info # Aminda Suomalainen FINEID 20.12.2021-20.12.2026 #signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM= @@ -57,14 +58,16 @@ [gpg] format = ssh #format = x509 +[gpg "ssh"] + allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers +#[gpg "x509"] +# program = gpgsm [tag] forceSignAnnotated = true [pull] ff = only [init] defaultBranch = cxefa -[gpg "ssh"] - allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers [advice] # I am not developing in detached head state, I generally want to compile # a specific version of a program and I know how to get out of it @@ -81,5 +84,3 @@ [lfs] setlockablereadonly = true locksverify = true -#[gpg "x509"] -# program = gpgsm