Rx3/network_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

- Fix CA & TC certificate path in cert_dump & vpn-admin_board.cgi.

Browse Source
This commit is contained in:
Arnaud G. GIBERT
2026-07-26 20:34:27 +02:00
parent 7a6379614d
commit 42da61a158
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReleaseNotes.txt
View File

@@ -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 Network Tools V 1.2.0 - A. GIBERT - 2026/05/19
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

5
SPECS/network_tools.spec
View File

@@ -24,7 +24,7 @@
%define name network_tools %define name network_tools
%define version 1.2.0 %define version 1.2.1
%define release %mkrel 1rx3 %define release %mkrel 1rx3
%global debug_package %{nil} %global debug_package %{nil}
@@ -213,5 +213,8 @@ cp www/cgi-bin/*.cgi %{buildroot}%{_webcgi}
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
%changelog %changelog
* 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 * 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 - Create initial SPEC file for 1.2.0 on Mageia 9

4
sbin/cert_dump
View File

@@ -163,7 +163,7 @@ cdu_args_parse()
cdu_cert_dump_ca() 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() cdu_cert_dump_tc()
{ {
cat "${OPENVPN_DIR}/tls/private/tc.key" cat "${OPENVPN_DIR}/tls/private/tc.rx3.net.key"
} }

4
www/cgi-bin/vpn-admin_board.cgi
View File

@@ -918,10 +918,10 @@ vab_command_handler()
vab_header_print vab_header_print
eval "echo \"$( sed </etc/openvpn/template/${template_name} \ 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/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/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} -e "s/CLIENT_FQDN/${HOST_NAME}/g")\"" | ${defroute_pipe}
fi fi
else else