From 63d6b883b8926456a70ed2766ef10dddbc701813 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sun, 26 Jul 2026 20:34:27 +0200 Subject: [PATCH] - Fix CA & TC certificate path in cert_dump & vpn-admin_board.cgi. --- ReleaseNotes.txt | 8 ++++++++ SPECS/network_tools.spec | 5 ++++- sbin/cert_dump | 4 ++-- www/cgi-bin/vpn-admin_board.cgi | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 01a1392..5a25da9 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/SPECS/network_tools.spec b/SPECS/network_tools.spec index ebe2d11..92f7aa2 100644 --- a/SPECS/network_tools.spec +++ b/SPECS/network_tools.spec @@ -24,7 +24,7 @@ %define name network_tools -%define version 1.2.0 +%define version 1.2.1 %define release %mkrel 1rx3 %global debug_package %{nil} @@ -213,5 +213,8 @@ cp www/cgi-bin/*.cgi %{buildroot}%{_webcgi} #----------------------------------------------------------------------------------------------------------------------------------- %changelog +* Sun Jul 26 2026 Arnaud G. GIBERT - 1.2.1-1rx3.mga9 +- Update to 1.2.1 + * Tue May 19 2026 Arnaud G. GIBERT - 1.2.0-1rx3.mga9 - Create initial SPEC file for 1.2.0 on Mageia 9 diff --git a/sbin/cert_dump b/sbin/cert_dump index 28b6a06..0b5351a 100755 --- a/sbin/cert_dump +++ b/sbin/cert_dump @@ -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" } diff --git a/www/cgi-bin/vpn-admin_board.cgi b/www/cgi-bin/vpn-admin_board.cgi index 548b892..d25743b 100755 --- a/www/cgi-bin/vpn-admin_board.cgi +++ b/www/cgi-bin/vpn-admin_board.cgi @@ -918,10 +918,10 @@ vab_command_handler() vab_header_print eval "echo \"$( sed \"; sudo cert_dump ca; echo \"<\/ca>\")/" \ + -e "s/ca tls\/certs\/ca.rx3.net.crt/\$(echo \"\"; sudo cert_dump ca; echo \"<\/ca>\")/" \ -e "s/cert tls\/certs\/CLIENT_FQDN.crt/\$(echo \"\"; sudo cert_dump crt CLIENT_FQDN; echo \"<\/cert>\")/" \ -e "s/key tls\/private\/CLIENT_FQDN.key/\$(echo \"\"; sudo cert_dump key CLIENT_FQDN; echo \"<\/key>\")/" \ - -e "s/tls-crypt tls\/private\/tc.key/\$(echo \"\"; sudo cert_dump tc; echo \"<\/tls-crypt>\")/" \ + -e "s/tls-crypt tls\/private\/tc.rx3.net.key/\$(echo \"\"; sudo cert_dump tc; echo \"<\/tls-crypt>\")/" \ -e "s/CLIENT_FQDN/${HOST_NAME}/g")\"" | ${defroute_pipe} fi else