Commits vergleichen

...

2 Commits

Autor SHA1 Nachricht Datum
67790007ce fixed the schemata 2025-06-25 19:51:20 +02:00
51a1e0c9bd fixed the schemageneration 2025-06-25 19:50:21 +02:00
3 geänderte Dateien mit 19 neuen und 37 gelöschten Zeilen

Datei anzeigen

@ -19,9 +19,10 @@
"default": null "default": null
}, },
"dns": { "dns": {
"description": "This contains the domains(Keys) and the DNS-Servers(values) that are responsible for it.",
"type": "object", "type": "object",
"additionalProperties": { "additionalProperties": {
"$ref": "#/$defs/DnsBuilder" "$ref": "#/$defs/Builder"
} }
}, },
"certificates_path": { "certificates_path": {
@ -29,6 +30,7 @@
"default": "certificates" "default": "certificates"
}, },
"ca": { "ca": {
"description": "The Key of this table describe an nickname for an CA.\nLetsencrypt Prod and Staging are builtin configured, so they doesn't have to be configured.",
"type": "object", "type": "object",
"additionalProperties": { "additionalProperties": {
"$ref": "#/$defs/CA" "$ref": "#/$defs/CA"
@ -37,7 +39,7 @@
}, },
"additionalProperties": false, "additionalProperties": false,
"$defs": { "$defs": {
"DnsBuilder": { "Builder": {
"oneOf": [ "oneOf": [
{ {
"type": "object", "type": "object",
@ -64,19 +66,6 @@
"server" "server"
] ]
}, },
{
"type": "object",
"properties": {
"type": {
"type": "string",
"const": "dnsupdate"
}
},
"additionalProperties": false,
"required": [
"type"
]
},
{ {
"type": "object", "type": "object",
"properties": { "properties": {

Datei anzeigen

@ -66,13 +66,19 @@
}, },
"owner": { "owner": {
"description": "Owner of the Certificate and private key", "description": "Owner of the Certificate and private key",
"type": "string", "type": [
"default": "" "string",
"null"
],
"default": null
}, },
"group": { "group": {
"description": "Group of the Certificate and private key", "description": "Group of the Certificate and private key",
"type": "string", "type": [
"default": "" "string",
"null"
],
"default": null
} }
}, },
"additionalProperties": false, "additionalProperties": false,
@ -81,7 +87,7 @@
"domains" "domains"
], ],
"$defs": { "$defs": {
"DnsBuilder": { "Builder": {
"oneOf": [ "oneOf": [
{ {
"type": "object", "type": "object",
@ -108,19 +114,6 @@
"server" "server"
] ]
}, },
{
"type": "object",
"properties": {
"type": {
"type": "string",
"const": "dnsupdate"
}
},
"additionalProperties": false,
"required": [
"type"
]
},
{ {
"type": "object", "type": "object",
"properties": { "properties": {

Datei anzeigen

@ -205,7 +205,7 @@ async fn schema_generator() -> Result<(), Error> {
schema_settings.meta_schema = Some(DRAFT07.into()); schema_settings.meta_schema = Some(DRAFT07.into());
let mut generator = SchemaGenerator::new(schema_settings); let mut generator = SchemaGenerator::new(schema_settings);
let general_schema = serialize_with_formatter(&generator.root_schema_for::<General>(), formatter.clone())?; let general_schema = serialize_with_formatter(&generator.root_schema_for::<General>(), formatter.clone())?;
match FILE_MODE_WRITE.clone().create_new(false).open("schema-general.json").await { match FILE_MODE_OVERWRITE.open("schema-general.json").await {
Ok(mut file) => { Ok(mut file) => {
match file.write(general_schema.as_bytes()).await { match file.write(general_schema.as_bytes()).await {
Ok(_) => {}, Ok(_) => {},
@ -216,7 +216,7 @@ async fn schema_generator() -> Result<(), Error> {
}; };
let site_schema = serialize_with_formatter(&generator.root_schema_for::<Site>(), formatter.clone())?; let site_schema = serialize_with_formatter(&generator.root_schema_for::<Site>(), formatter.clone())?;
match FILE_MODE_WRITE.clone().create_new(false).open("schema-site.json").await { match FILE_MODE_OVERWRITE.open("schema-site.json").await {
Ok(mut file) => { Ok(mut file) => {
match file.write(site_schema.as_bytes()).await { match file.write(site_schema.as_bytes()).await {
Ok(_) => {}, Ok(_) => {},