diff --git a/.schemastore/config.schema.json b/.schemastore/config.schema.json index f24258a24753..4ddec4c7b6c3 100644 --- a/.schemastore/config.schema.json +++ b/.schemastore/config.schema.json @@ -339,7 +339,8 @@ "vk", "yandex", "apple", - "spotify" + "spotify", + "netid" ], "examples": [ "google" @@ -1494,11 +1495,24 @@ "smtp://foo:bar@my-mailserver:1234/ (Explicit StartTLS with certificate trust verification)", "smtp://foo:bar@my-mailserver:1234/?skip_ssl_verify=true (NOT RECOMMENDED: Explicit StartTLS without certificate trust verification)", "smtps://foo:bar@my-mailserver:1234/ (Implicit TLS with certificate trust verification)", - "smtps://foo:bar@my-mailserver:1234/?skip_ssl_verify=true (NOT RECOMMENDED: Implicit TLS without certificate trust verification)" + "smtps://foo:bar@my-mailserver:1234/?skip_ssl_verify=true (NOT RECOMMENDED: Implicit TLS without certificate trust verification)", + "smtps://subdomain.my-mailserver:1234/?server_name=my-mailserver (allows TLS to work if the server is hosted on a sudomain that uses a non-wildcard domain certificate)" ], "type": "string", "pattern": "^smtps?:\\/\\/.*" }, + "client_cert_path": { + "title": "SMTP Client certificate path", + "description": "Path of the client X.509 certificate, in case of certificate based client authentication to the SMTP server.", + "type": "string", + "default": "" + }, + "client_key_path": { + "title": "SMTP Client private key path", + "description": "Path of the client certificate private key, in case of certificate based client authentication to the SMTP server", + "type": "string", + "default": "" + }, "from_address": { "title": "SMTP Sender Address", "description": "The recipient of an email will see this as the sender address.", @@ -1525,6 +1539,12 @@ "X-SES-RETURN-PATH-ARN": "arn:aws:ses:us-west-2:123456789012:identity/example.com" } ] + }, + "local_name": { + "title": "SMTP HELO/EHLO name", + "description": "Identifier used in the SMTP HELO/EHLO command. Some SMTP relays require a unique identifier.", + "type": "string", + "default": "localhost" } }, "required": [ @@ -1827,7 +1847,7 @@ "additionalProperties": false }, "tracing": { - "$ref": "https://raw.githubusercontent.com/ory/x/v0.0.370/otelx/config.schema.json" + "$ref": "https://raw.githubusercontent.com/ory/x/v0.0.392/otelx/config.schema.json" }, "log": { "title": "Log", @@ -1881,6 +1901,7 @@ "schemas": { "type": "array", "title": "All JSON Schemas for Identity Traits", + "description": "Note that identities that used the \"default_schema_url\" field in older kratos versions will be corrupted unless you specify their schema url with the id \"default\" in this list.", "examples": [ [ { diff --git a/script/render-schemas.sh b/script/render-schemas.sh index 0566081a3ec4..86d7d8f4533a 100755 --- a/script/render-schemas.sh +++ b/script/render-schemas.sh @@ -9,5 +9,5 @@ sed "s!ory://tracing-config!https://raw.githubusercontent.com/ory/x/$ory_x_versi git config user.email "60093411+ory-bot@users.noreply.github.com" git config user.name "ory-bot" -git add .schema/config.schema.json +git add embedx/config.schema.json git commit -m "autogen: render config schema"