NationTech/harmony
6
0
Fork 1
Code Issues 35 Pull Requests 6 Actions Packages Projects Releases 1 Wiki Activity

feat: Upgrade opnsense-config crates to be compatible with opnsense 25.1_5

Browse Source
This commit is contained in:
Jean-Gabriel Gill-Couture 2025-05-06 11:45:19 -04:00
parent b7fe62fcbb
commit 8a199b64f5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opnsense-config-xml/src/data/caddy.rs
View File

@ -40,7 +40,11 @@ pub struct CaddyGeneral {
#[yaserde(rename = "TlsDnsOptionalField4")] #[yaserde(rename = "TlsDnsOptionalField4")]
pub tls_dns_optional_field4: MaybeString, pub tls_dns_optional_field4: MaybeString,
#[yaserde(rename = "TlsDnsPropagationTimeout")] #[yaserde(rename = "TlsDnsPropagationTimeout")]
pub tls_dns_propagation_timeout: MaybeString, pub tls_dns_propagation_timeout: Option<MaybeString>,
#[yaserde(rename = "TlsDnsPropagationTimeoutPeriod")]
pub tls_dns_propagation_timeout_period: Option<MaybeString>,
#[yaserde(rename = "TlsDnsPropagationDelay")]
pub tls_dns_propagation_delay: Option<MaybeString>,
#[yaserde(rename = "TlsDnsPropagationResolvers")] #[yaserde(rename = "TlsDnsPropagationResolvers")]
pub tls_dns_propagation_resolvers: MaybeString, pub tls_dns_propagation_resolvers: MaybeString,
pub accesslist: MaybeString, pub accesslist: MaybeString,

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

@ -45,6 +45,7 @@ pub struct OPNsense {
#[yaserde(rename = "Pischem")] #[yaserde(rename = "Pischem")]
pub pischem: Option<Pischem>, pub pischem: Option<Pischem>,
pub ifgroups: Ifgroups, pub ifgroups: Ifgroups,
pub dnsmasq: Option<RawXml>,
} }
impl From<String> for OPNsense { impl From<String> for OPNsense {
@ -166,7 +167,7 @@ pub struct Sysctl {
pub struct SysctlItem { pub struct SysctlItem {
pub descr: MaybeString, pub descr: MaybeString,
pub tunable: String, pub tunable: String,
pub value: String, pub value: MaybeString,
} }
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]
@ -279,6 +280,7 @@ pub struct User {
pub scope: String, pub scope: String,
pub groupname: Option<MaybeString>, pub groupname: Option<MaybeString>,
pub password: String, pub password: String,
pub pwd_changed_at: Option<MaybeString>,
pub uid: u32, pub uid: u32,
pub disabled: Option<u8>, pub disabled: Option<u8>,
pub landing_page: Option<MaybeString>, pub landing_page: Option<MaybeString>,
@ -540,6 +542,8 @@ pub struct GeneralIpsec {
preferred_oldsa: Option<MaybeString>, preferred_oldsa: Option<MaybeString>,
disablevpnrules: Option<MaybeString>, disablevpnrules: Option<MaybeString>,
passthrough_networks: Option<MaybeString>, passthrough_networks: Option<MaybeString>,
user_source: Option<MaybeString>,
local_group: Option<MaybeString>,
} }
#[derive(Debug, YaSerialize, YaDeserialize, PartialEq)] #[derive(Debug, YaSerialize, YaDeserialize, PartialEq)]
@ -1219,6 +1223,7 @@ pub struct Host {
pub rr: String, pub rr: String,
pub mxprio: MaybeString, pub mxprio: MaybeString,
pub mx: MaybeString, pub mx: MaybeString,
pub ttl: MaybeString,
pub server: String, pub server: String,
pub description: Option<String>, pub description: Option<String>,
} }
@ -1233,6 +1238,7 @@ impl Host {
rr, rr,
server, server,
mxprio: MaybeString::default(), mxprio: MaybeString::default(),
ttl: MaybeString::default(),
mx: MaybeString::default(), mx: MaybeString::default(),
description: None, description: None,
} }
@ -1421,7 +1427,7 @@ pub struct VirtualIp {
#[yaserde(attribute = true)] #[yaserde(attribute = true)]
pub version: String, pub version: String,
#[yaserde(rename = "vip")] #[yaserde(rename = "vip")]
pub vip: Vip, pub vip: Option<Vip>,
} }
#[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)] #[derive(Default, PartialEq, Debug, YaSerialize, YaDeserialize)]