From 162c72aa1bc88a7a7b0a75527789edfd952787a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Sun, 10 Nov 2024 15:39:03 +0100 Subject: [PATCH] Disable git gpg signing unconditionally --- _machines/ares.yml | 1 - _machines/neptune.yml | 2 -- git/gitconfig.j2 | 5 +---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/_machines/ares.yml b/_machines/ares.yml index 3af86f8..7242119 100644 --- a/_machines/ares.yml +++ b/_machines/ares.yml @@ -26,7 +26,6 @@ users: manage_css: true bigger_font: true mail: hannes@hkoerber.de - git_gpg_sign: false ssh_agent: false gpg_agent: true gpg_agent_for_ssh: true diff --git a/_machines/neptune.yml b/_machines/neptune.yml index 05080ce..6ab31f4 100644 --- a/_machines/neptune.yml +++ b/_machines/neptune.yml @@ -19,7 +19,6 @@ users: - ublock-origin manage_css: false mail: h.koerber@clipmyhorse.tv - git_gpg_sign: false ssh_agent: true gpg_agent: false gpg_agent_for_ssh: false @@ -40,7 +39,6 @@ users: - floccus manage_css: true mail: hannes@hkoerber.de - git_gpg_sign: false ssh_agent: false gpg_agent: true gpg_agent_for_ssh: true diff --git a/git/gitconfig.j2 b/git/gitconfig.j2 index 3b54c0c..72cc7cf 100644 --- a/git/gitconfig.j2 +++ b/git/gitconfig.j2 @@ -2,9 +2,6 @@ name = Hannes Körber email = {{ user.mail }} useConfigOnly = true -{% if user.git_gpg_sign|bool %} - signingkey = {{ user.gpg_key.id }} -{% endif %} [github] user = hakoerber [alias] @@ -92,7 +89,7 @@ commitBeforeMerge = false detachedHead = false [commit] - gpgSign = {{ user.git_gpg_sign|bool }} + gpgSign = false cleanup = strip status = true [status]