NationTech/harmony
5
0
Fork 2
Code Issues 38 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

fix: added fields missing for haproxy after most recent update #191

Merged
wjro merged 5 commits from fix/opnsense_update into master 2025-12-17 20:03:52 +00:00
Conversation 0 Commits 5 Files Changed 14 +65 -10
14 changed files with 65 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
opnsense-config-xml/src/data/haproxy.rs
View File

@@ -106,11 +106,37 @@ pub struct HAProxy {
pub groups: MaybeString, pub groups: MaybeString,
pub users: MaybeString, pub users: MaybeString,
pub cpus: MaybeString, pub cpus: MaybeString,
pub resolvers: MaybeString, pub resolvers: HAProxyResolvers,
pub mailers: MaybeString, pub mailers: MaybeString,
pub maintenance: Maintenance, pub maintenance: Maintenance,
} }
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct HAProxyResolvers {
#[yaserde(rename = "resolver")]
pub resolver: Option<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)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Maintenance { pub struct Maintenance {
#[yaserde(rename = "cronjobs")] #[yaserde(rename = "cronjobs")]

23
opnsense-config-xml/src/data/opnsense.rs
View File

@@ -136,6 +136,7 @@ pub struct Rule {
pub updated: Option<Updated>, pub updated: Option<Updated>,
pub created: Option<Created>, pub created: Option<Created>,
pub disabled: Option<MaybeString>, pub disabled: Option<MaybeString>,
pub log: Option<u32>,
} }
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -216,7 +217,7 @@ pub struct System {
pub maximumfrags: Option<MaybeString>, pub maximumfrags: Option<MaybeString>,
pub aliasesresolveinterval: Option<MaybeString>, pub aliasesresolveinterval: Option<MaybeString>,
pub maximumtableentries: Option<MaybeString>, pub maximumtableentries: Option<MaybeString>,
pub language: String, pub language: Option<String>,
pub dnsserver: Option<MaybeString>, pub dnsserver: Option<MaybeString>,
pub dns1gw: Option<String>, pub dns1gw: Option<String>,
pub dns2gw: Option<String>, pub dns2gw: Option<String>,
@@ -1140,6 +1141,7 @@ pub struct UnboundGeneral {
pub local_zone_type: String, pub local_zone_type: String,
pub outgoing_interface: MaybeString, pub outgoing_interface: MaybeString,
pub enable_wpad: MaybeString, pub enable_wpad: MaybeString,
pub safesearch: MaybeString,
} }
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@@ -1193,15 +1195,15 @@ pub struct Acls {
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
pub struct Dnsbl { pub struct Dnsbl {
pub enabled: i32, pub enabled: Option<i32>,
pub safesearch: MaybeString, pub safesearch: Option<MaybeString>,
#[yaserde(rename = "type")] #[yaserde(rename = "type")]
pub r#type: MaybeString, pub r#type: Option<MaybeString>,
pub lists: MaybeString, pub lists: Option<MaybeString>,
pub whitelists: MaybeString, pub whitelists: Option<MaybeString>,
pub blocklists: MaybeString, pub blocklists: Option<MaybeString>,
pub wildcards: MaybeString, pub wildcards: Option<MaybeString>,
pub address: MaybeString, pub address: Option<MaybeString>,
pub nxdomain: Option<i32>, pub nxdomain: Option<i32>,
} }
@@ -1229,6 +1231,7 @@ pub struct Host {
pub ttl: Option<MaybeString>, pub ttl: Option<MaybeString>,
pub server: String, pub server: String,
pub description: Option<String>, pub description: Option<String>,
pub txtdata: MaybeString,
} }
impl Host { impl Host {
@@ -1244,6 +1247,7 @@ impl Host {
ttl: Some(MaybeString::default()), ttl: Some(MaybeString::default()),
mx: MaybeString::default(), mx: MaybeString::default(),
description: None, description: None,
txtdata: MaybeString::default(),
} }
} }
} }
@@ -1291,6 +1295,7 @@ pub struct WireguardServerItem {
pub gateway: MaybeString, pub gateway: MaybeString,
pub carp_depend_on: MaybeString, pub carp_depend_on: MaybeString,
pub peers: String, pub peers: String,
pub debug: MaybeString,
pub endpoint: MaybeString, pub endpoint: MaybeString,
pub peer_dns: MaybeString, pub peer_dns: MaybeString,
} }

1
opnsense-config/src/tests/data/config-25.7-dnsmasq-static-host.xml
View File

@@ -612,6 +612,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad>0</enable_wpad> <enable_wpad>0</enable_wpad>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity>0</hideidentity> <hideidentity>0</hideidentity>

5
opnsense-config/src/tests/data/config-full-1.xml
View File

@@ -2003,6 +2003,7 @@
<cacheflush/> <cacheflush/>
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<safesearch/>
<enable_wpad/> <enable_wpad/>
</general> </general>
<advanced> <advanced>
@@ -2071,6 +2072,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
<host uuid="dd593e95-02bc-476f-8610-fa1ee454e950"> <host uuid="dd593e95-02bc-476f-8610-fa1ee454e950">
<enabled>1</enabled> <enabled>1</enabled>
@@ -2081,6 +2083,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
<host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d"> <host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d">
<enabled>1</enabled> <enabled>1</enabled>
@@ -2091,6 +2094,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
</hosts> </hosts>
<aliases/> <aliases/>
@@ -2117,6 +2121,7 @@
<endpoint/> <endpoint/>
<peer_dns/> <peer_dns/>
<carp_depend_on/> <carp_depend_on/>
<debug/>
<peers>03031aec-2e84-462e-9eab-57762dde667a,98e6ca3d-1de9-449b-be80-77022221b509,67c0ace5-e802-4d2b-a536-f8b7a2db6f99,74b60fff-7844-4097-9966-f1c2b1ad29ff,3de82ad5-bc1b-4b91-9598-f906e58ac937,a95e6b5e-24a4-40b5-bb41-b79e784f6f1c,6c9a12c6-c1ca-4c14-866b-975406a30590,c33b308b-7125-4688-9561-989ace8787b5,e43f004a-23bf-4027-8fb0-953fbb40479f</peers> <peers>03031aec-2e84-462e-9eab-57762dde667a,98e6ca3d-1de9-449b-be80-77022221b509,67c0ace5-e802-4d2b-a536-f8b7a2db6f99,74b60fff-7844-4097-9966-f1c2b1ad29ff,3de82ad5-bc1b-4b91-9598-f906e58ac937,a95e6b5e-24a4-40b5-bb41-b79e784f6f1c,6c9a12c6-c1ca-4c14-866b-975406a30590,c33b308b-7125-4688-9561-989ace8787b5,e43f004a-23bf-4027-8fb0-953fbb40479f</peers>
</server> </server>
</servers> </servers>

1
opnsense-config/src/tests/data/config-full-25.7-dnsmasq-options.xml
View File

@@ -614,6 +614,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad>0</enable_wpad> <enable_wpad>0</enable_wpad>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity>0</hideidentity> <hideidentity>0</hideidentity>

1
opnsense-config/src/tests/data/config-full-25.7-dummy-dnsmasq-options.xml
View File

@@ -750,6 +750,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad>0</enable_wpad> <enable_wpad>0</enable_wpad>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity>0</hideidentity> <hideidentity>0</hideidentity>

1
opnsense-config/src/tests/data/config-full-25.7.xml
View File

@@ -709,6 +709,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad>0</enable_wpad> <enable_wpad>0</enable_wpad>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity>0</hideidentity> <hideidentity>0</hideidentity>

1
opnsense-config/src/tests/data/config-full-ncd0.xml
View File

@@ -951,6 +951,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad/> <enable_wpad/>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity>0</hideidentity> <hideidentity>0</hideidentity>

1
opnsense-config/src/tests/data/config-opnsense-25.1.xml
View File

@@ -808,6 +808,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad/> <enable_wpad/>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity/> <hideidentity/>

5
opnsense-config/src/tests/data/config-structure-with-dhcp-staticmap-entry.xml
View File

@@ -726,6 +726,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad/> <enable_wpad/>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity>0</hideidentity> <hideidentity>0</hideidentity>
@@ -793,6 +794,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
<host uuid="dd593e95-02bc-476f-8610-fa1ee454e950"> <host uuid="dd593e95-02bc-476f-8610-fa1ee454e950">
<enabled>1</enabled> <enabled>1</enabled>
@@ -803,6 +805,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
<host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d"> <host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d">
<enabled>1</enabled> <enabled>1</enabled>
@@ -813,6 +816,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
</hosts> </hosts>
<aliases/> <aliases/>
@@ -838,6 +842,7 @@
<gateway/> <gateway/>
<carp_depend_on/> <carp_depend_on/>
<peers>03031aec-2e84-462e-9eab-57762dde667a,98e6ca3d-1de9-449b-be80-77022221b509,67c0ace5-e802-4d2b-a536-f8b7a2db6f99,74b60fff-7844-4097-9966-f1c2b1ad29ff,3de82ad5-bc1b-4b91-9598-f906e58ac937,a95e6b5e-24a4-40b5-bb41-b79e784f6f1c,6c9a12c6-c1ca-4c14-866b-975406a30590,c33b308b-7125-4688-9561-989ace8787b5,e43f004a-23bf-4027-8fb0-953fbb40479f</peers> <peers>03031aec-2e84-462e-9eab-57762dde667a,98e6ca3d-1de9-449b-be80-77022221b509,67c0ace5-e802-4d2b-a536-f8b7a2db6f99,74b60fff-7844-4097-9966-f1c2b1ad29ff,3de82ad5-bc1b-4b91-9598-f906e58ac937,a95e6b5e-24a4-40b5-bb41-b79e784f6f1c,6c9a12c6-c1ca-4c14-866b-975406a30590,c33b308b-7125-4688-9561-989ace8787b5,e43f004a-23bf-4027-8fb0-953fbb40479f</peers>
<debug/>
<endpoint/> <endpoint/>
<peer_dns/> <peer_dns/>
</server> </server>

5
opnsense-config/src/tests/data/config-structure.xml
View File

@@ -718,6 +718,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad/> <enable_wpad/>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity>0</hideidentity> <hideidentity>0</hideidentity>
@@ -785,6 +786,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
<host uuid="dd593e95-02bc-476f-8610-fa1ee454e950"> <host uuid="dd593e95-02bc-476f-8610-fa1ee454e950">
<enabled>1</enabled> <enabled>1</enabled>
@@ -795,6 +797,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
<host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d"> <host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d">
<enabled>1</enabled> <enabled>1</enabled>
@@ -805,6 +808,7 @@
<mx/> <mx/>
<server>192.168.20.161</server> <server>192.168.20.161</server>
<description>Some app local</description> <description>Some app local</description>
<txtdata/>
</host> </host>
</hosts> </hosts>
<aliases/> <aliases/>
@@ -832,6 +836,7 @@
<gateway/> <gateway/>
<carp_depend_on/> <carp_depend_on/>
<peers>03031aec-2e84-462e-9eab-57762dde667a,98e6ca3d-1de9-449b-be80-77022221b509,67c0ace5-e802-4d2b-a536-f8b7a2db6f99,74b60fff-7844-4097-9966-f1c2b1ad29ff,3de82ad5-bc1b-4b91-9598-f906e58ac937,a95e6b5e-24a4-40b5-bb41-b79e784f6f1c,6c9a12c6-c1ca-4c14-866b-975406a30590,c33b308b-7125-4688-9561-989ace8787b5,e43f004a-23bf-4027-8fb0-953fbb40479f</peers> <peers>03031aec-2e84-462e-9eab-57762dde667a,98e6ca3d-1de9-449b-be80-77022221b509,67c0ace5-e802-4d2b-a536-f8b7a2db6f99,74b60fff-7844-4097-9966-f1c2b1ad29ff,3de82ad5-bc1b-4b91-9598-f906e58ac937,a95e6b5e-24a4-40b5-bb41-b79e784f6f1c,6c9a12c6-c1ca-4c14-866b-975406a30590,c33b308b-7125-4688-9561-989ace8787b5,e43f004a-23bf-4027-8fb0-953fbb40479f</peers>
<debug/>
</server> </server>
</servers> </servers>
</server> </server>

1
opnsense-config/src/tests/data/config-vm-test.xml
View File

@@ -869,6 +869,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad/> <enable_wpad/>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity/> <hideidentity/>

1
opnsense-config/src/tests/data/config-vm-test_cheat_descr.xml
View File

@@ -862,6 +862,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad/> <enable_wpad/>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity/> <hideidentity/>

1
opnsense-config/src/tests/data/config-vm-test_linted.xml
View File

@@ -869,6 +869,7 @@
<local_zone_type>transparent</local_zone_type> <local_zone_type>transparent</local_zone_type>
<outgoing_interface/> <outgoing_interface/>
<enable_wpad/> <enable_wpad/>
<safesearch/>
</general> </general>
<advanced> <advanced>
<hideidentity/> <hideidentity/>