From 29c82db70d11f18c158151c139b8dcaf163bfe82 Mon Sep 17 00:00:00 2001 From: Willem Date: Wed, 12 Nov 2025 13:21:55 -0500 Subject: [PATCH] fix: added fields missing for haproxy after most recent update --- opnsense-config-xml/src/data/haproxy.rs | 29 +++++++++++++++++++++++- opnsense-config-xml/src/data/opnsense.rs | 5 +++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/opnsense-config-xml/src/data/haproxy.rs b/opnsense-config-xml/src/data/haproxy.rs index b0aedc2..a7622db 100644 --- a/opnsense-config-xml/src/data/haproxy.rs +++ b/opnsense-config-xml/src/data/haproxy.rs @@ -106,11 +106,38 @@ pub struct HAProxy { pub groups: MaybeString, pub users: MaybeString, pub cpus: MaybeString, - pub resolvers: MaybeString, + pub resolvers: HAProxyResolvers, pub mailers: MaybeString, pub maintenance: Maintenance, } +#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] +pub struct HAProxyResolvers { + #[yaserde(rename = "resolver")] + pub resolver: Resolver, + +} + +#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] +pub struct Resolver { + pub id: String, + pub enabled: i32, + pub name: String, + pub description: MaybeString, + pub nameservers: String, + pub parse_resolv_conf: String, + pub resolve_retries: i32, + pub timeout_resolve: String, + pub timeout_retry: String, + pub accepted_payload_size: MaybeString, + pub hold_valid: MaybeString, + pub hold_obsolete: MaybeString, + pub hold_refused: MaybeString, + pub hold_nx: MaybeString, + pub hold_timeout: MaybeString, + pub hold_other: MaybeString, +} + #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] pub struct Maintenance { #[yaserde(rename = "cronjobs")] diff --git a/opnsense-config-xml/src/data/opnsense.rs b/opnsense-config-xml/src/data/opnsense.rs index fa5f985..9880423 100644 --- a/opnsense-config-xml/src/data/opnsense.rs +++ b/opnsense-config-xml/src/data/opnsense.rs @@ -8,6 +8,8 @@ use yaserde_derive::{YaDeserialize, YaSerialize}; use super::{Interface, Pischem}; + + #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[yaserde(rename = "opnsense")] pub struct OPNsense { @@ -216,7 +218,7 @@ pub struct System { pub maximumfrags: Option, pub aliasesresolveinterval: Option, pub maximumtableentries: Option, - pub language: String, + pub language: Option, pub dnsserver: Option, pub dns1gw: Option, pub dns2gw: Option, @@ -1291,6 +1293,7 @@ pub struct WireguardServerItem { pub gateway: MaybeString, pub carp_depend_on: MaybeString, pub peers: String, + pub debug: MaybeString, pub endpoint: MaybeString, pub peer_dns: MaybeString, }