From 52dc451b53eecb10f50d5a5910d72b02d7fd04bb Mon Sep 17 00:00:00 2001
From: Julien Vincent <m@julienvincent.io>
Date: Tue, 13 Feb 2024 02:18:13 +0000
Subject: [PATCH] Update config-schema.json

---
 cli/src/config-schema.json | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/cli/src/config-schema.json b/cli/src/config-schema.json
index a43b5df704..df9e13aaf6 100644
--- a/cli/src/config-schema.json
+++ b/cli/src/config-schema.json
@@ -366,17 +366,23 @@
             "properties": {
                 "backend": {
                     "type": "string",
-                    "description": "Which backend to use to create commit signatures"
+                    "enum": ["gpg", "ssh"],
+                    "description": "The backend to use for signing commits"
                 },
                 "key": {
                     "type": "string",
-                    "description": "The key parameter to pass to the signing backend. Overridden by `jj sign` parameter or by the global `--sign-with` option"
+                    "description": "The key the configured signing backend will use to to sign commits. Overridden by `jj sign` parameter or by the global `--sign-with` option"
                 },
                 "sign-all": {
                     "type": "boolean",
                     "description": "Whether to sign all commits by default. Overridden by global `--no-sign` option",
                     "default": false
                 },
+                "show-signatures": {
+                    "type": "boolean",
+                    "description": "Whether or not to always verify and display commit signatures",
+                    "default": false
+                },
                 "backends": {
                     "type": "object",
                     "description": "Tables of options to pass to specific signing backends",
@@ -387,12 +393,27 @@
                                 "program": {
                                     "type": "string",
                                     "description": "Path to the gpg program to be called",
-                                    "default": "gpg2"
+                                    "default": "gpg"
+                                },
+                                "allow-expired-keys": {
+                                    "type": "boolean",
+                                    "description": "Whether to consider signatures generated with an expired key as invalid",
+                                    "default": true
+                                }
+                            }
+                        },
+                        "ssh": {
+                            "type": "object",
+                            "properties": {
+                                "program": {
+                                    "type": "string",
+                                    "description": "Path to the ssh-keygen program to be called",
+                                    "default": "ssh-keygen"
                                 },
-                                "consider-expired-keys-bad": {
+                                "allowed-signers": {
                                     "type": "boolean",
-                                    "description": "Whether to consider signatures made with an expired key as bad",
-                                    "default": false
+                                    "description": "Path to an allowed signers file used for signature verification",
+                                    "default": true
                                 }
                             }
                         }