2 Commits

5 changed files with 29 additions and 7 deletions

View File

@@ -1,3 +1,19 @@
------------------------------------------------------------------------------------------------------------------------------------
Network Tools V 1.2.2 - A. GIBERT - 2026/08/18
------------------------------------------------------------------------------------------------------------------------------------
- Exclude Gateway destination type from PREROUTING-VPN rule call.
------------------------------------------------------------------------------------------------------------------------------------
Network Tools V 1.2.1 - A. GIBERT - 2026/07/26
------------------------------------------------------------------------------------------------------------------------------------
- Fix CA & TC certificate path in cert_dump & vpn-admin_board.cgi.
------------------------------------------------------------------------------------------------------------------------------------
Network Tools V 1.2.0 - A. GIBERT - 2026/05/19
------------------------------------------------------------------------------------------------------------------------------------

View File

@@ -24,7 +24,7 @@
%define name network_tools
%define version 1.2.0
%define version 1.2.2
%define release %mkrel 1rx3
%global debug_package %{nil}
@@ -213,5 +213,11 @@ cp www/cgi-bin/*.cgi %{buildroot}%{_webcgi}
#-----------------------------------------------------------------------------------------------------------------------------------
%changelog
* Tue Aug 18 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.2.2-1rx3.mga9
- Update to 1.2.2
* Sun Jul 26 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.2.1-1rx3.mga9
- Update to 1.2.1
* Tue May 19 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.2.0-1rx3.mga9
- Create initial SPEC file for 1.2.0 on Mageia 9

View File

@@ -1367,7 +1367,7 @@ network_forward_start()
do
network_dst_tab_get ${dst_id}
if [[ "${dst_type}" != "0" ]]
if [[ ( "${dst_type}" != "0") && ( "${dst_type}" != "1") ]]
then
${DEBUG} iptables -t nat -A PREROUTING -i ${dst_device} -j PREROUTING-VPN
fi
@@ -1424,7 +1424,7 @@ network_forward_stop()
do
network_dst_tab_get ${dst_id}
if [[ "${dst_type}" != "0" ]]
if [[ ( "${dst_type}" != "0") && ( "${dst_type}" != "1") ]]
then
${DEBUG} iptables -t nat -D PREROUTING -i ${dst_device} -j PREROUTING-VPN 2>/dev/null || true
fi

View File

@@ -163,7 +163,7 @@ cdu_args_parse()
cdu_cert_dump_ca()
{
cat "${OPENVPN_DIR}/tls/certs/ca.crt"
cat "${OPENVPN_DIR}/tls/certs/ca.rx3.net.crt"
}
@@ -176,7 +176,7 @@ cdu_cert_dump_ca()
cdu_cert_dump_tc()
{
cat "${OPENVPN_DIR}/tls/private/tc.key"
cat "${OPENVPN_DIR}/tls/private/tc.rx3.net.key"
}

View File

@@ -918,10 +918,10 @@ vab_command_handler()
vab_header_print
eval "echo \"$( sed </etc/openvpn/template/${template_name} \
-e "s/ca tls\/certs\/ca.crt/\$(echo \"<ca>\"; sudo cert_dump ca; echo \"<\/ca>\")/" \
-e "s/ca tls\/certs\/ca.rx3.net.crt/\$(echo \"<ca>\"; sudo cert_dump ca; echo \"<\/ca>\")/" \
-e "s/cert tls\/certs\/CLIENT_FQDN.crt/\$(echo \"<cert>\"; sudo cert_dump crt CLIENT_FQDN; echo \"<\/cert>\")/" \
-e "s/key tls\/private\/CLIENT_FQDN.key/\$(echo \"<key>\"; sudo cert_dump key CLIENT_FQDN; echo \"<\/key>\")/" \
-e "s/tls-crypt tls\/private\/tc.key/\$(echo \"<tls-crypt>\"; sudo cert_dump tc; echo \"<\/tls-crypt>\")/" \
-e "s/tls-crypt tls\/private\/tc.rx3.net.key/\$(echo \"<tls-crypt>\"; sudo cert_dump tc; echo \"<\/tls-crypt>\")/" \
-e "s/CLIENT_FQDN/${HOST_NAME}/g")\"" | ${defroute_pipe}
fi
else