From 1516c90aa992fab4f1be87b08e73f5f7b4d5dd55 Mon Sep 17 00:00:00 2001 From: Julien Vincent Date: Sun, 18 Feb 2024 15:07:54 +0000 Subject: [PATCH] sign: Update config-schema.json --- cli/src/config-schema.json | 40 ++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/cli/src/config-schema.json b/cli/src/config-schema.json index c3f0285fa..0db9dd1cc 100644 --- a/cli/src/config-schema.json +++ b/cli/src/config-schema.json @@ -366,11 +366,12 @@ "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", @@ -380,10 +381,41 @@ "backends": { "type": "object", "description": "Tables of options to pass to specific signing backends", - "properties": {}, + "properties": { + "gpg": { + "type": "object", + "properties": { + "program": { + "type": "string", + "description": "Path to the gpg program to be called", + "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" + }, + "allowed-signers": { + "type": "boolean", + "description": "Path to an allowed signers file used for signature verification", + "default": true + } + } + } + }, "additionalProperties": true } } } } -} \ No newline at end of file +}