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

Merge remote-tracking branch 'origin/master' into feat/install_opnsense_node_exporter
All checks were successful
Run Check Script / check (pull_request) Successful in 55s
Details

Browse Source
This commit is contained in:
wjro
2026-01-06 13:56:48 -05:00
parent c2fa4f1869 004b35f08e
commit 4f8cd0c1cb
98 changed files with 4248 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opnsense-config/src/modules/dhcp_legacy.rs
View File

@@ -86,10 +86,7 @@ impl<'a> DhcpConfigLegacyISC<'a> {
mac,
ipaddr: ipaddr.to_string(),
hostname,
descr: Default::default(),
winsserver: Default::default(),
dnsserver: Default::default(),
ntpserver: Default::default(),
..Default::default()
};
existing_mappings.push(static_map);
@@ -126,9 +123,7 @@ impl<'a> DhcpConfigLegacyISC<'a> {
ipaddr: entry["ipaddr"].as_str().unwrap_or_default().to_string(),
hostname: entry["hostname"].as_str().unwrap_or_default().to_string(),
descr: entry["descr"].as_str().map(MaybeString::from),
winsserver: MaybeString::default(),
dnsserver: MaybeString::default(),
ntpserver: MaybeString::default(),
..Default::default()
})
.collect();

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>
<outgoing_interface/>
<enable_wpad>0</enable_wpad>
<safesearch/>
</general>
<advanced>
<hideidentity>0</hideidentity>

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

@@ -2003,6 +2003,7 @@
<cacheflush/>
<local_zone_type>transparent</local_zone_type>
<outgoing_interface/>
<safesearch/>
<enable_wpad/>
</general>
<advanced>
@@ -2071,6 +2072,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
<host uuid="dd593e95-02bc-476f-8610-fa1ee454e950">
<enabled>1</enabled>
@@ -2081,6 +2083,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
<host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d">
<enabled>1</enabled>
@@ -2091,6 +2094,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
</hosts>
<aliases/>
@@ -2117,6 +2121,7 @@
<endpoint/>
<peer_dns/>
<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>
</server>
</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>
<outgoing_interface/>
<enable_wpad>0</enable_wpad>
<safesearch/>
</general>
<advanced>
<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>
<outgoing_interface/>
<enable_wpad>0</enable_wpad>
<safesearch/>
</general>
<advanced>
<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>
<outgoing_interface/>
<enable_wpad>0</enable_wpad>
<safesearch/>
</general>
<advanced>
<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>
<outgoing_interface/>
<enable_wpad/>
<safesearch/>
</general>
<advanced>
<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>
<outgoing_interface/>
<enable_wpad/>
<safesearch/>
</general>
<advanced>
<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>
<outgoing_interface/>
<enable_wpad/>
<safesearch/>
</general>
<advanced>
<hideidentity>0</hideidentity>
@@ -793,6 +794,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
<host uuid="dd593e95-02bc-476f-8610-fa1ee454e950">
<enabled>1</enabled>
@@ -803,6 +805,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
<host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d">
<enabled>1</enabled>
@@ -813,6 +816,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
</hosts>
<aliases/>
@@ -840,6 +844,7 @@
<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>
<endpoint/>
<peer_dns/>
<debug/>
</server>
</servers>
</server>

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

@@ -718,6 +718,7 @@
<local_zone_type>transparent</local_zone_type>
<outgoing_interface/>
<enable_wpad/>
<safesearch/>
</general>
<advanced>
<hideidentity>0</hideidentity>
@@ -785,6 +786,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
<host uuid="dd593e95-02bc-476f-8610-fa1ee454e950">
<enabled>1</enabled>
@@ -795,6 +797,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
<host uuid="e1606f96-dd38-471f-a3d7-ad25e41e810d">
<enabled>1</enabled>
@@ -805,6 +808,7 @@
<mx/>
<server>192.168.20.161</server>
<description>Some app local</description>
<txtdata/>
</host>
</hosts>
<aliases/>
@@ -832,6 +836,7 @@
<gateway/>
<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>
<debug/>
</server>
</servers>
</server>

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

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