[git.ipfire.org] IPFire 2.x development tree branch, next, updated. da2448190e4b27d0cfeb97306a96fc8ad0ae50e7

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. da2448190e4b27d0cfeb97306a96fc8ad0ae50e7

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  da2448190e4b27d0cfeb97306a96fc8ad0ae50e7 (commit)
      from  019ee8a8849d9cf7de4d8bd39a151e7b1b3135b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da2448190e4b27d0cfeb97306a96fc8ad0ae50e7
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Thu Jan 15 18:33:05 2026 +0100

    ovpnmain.cgi: No longer include the CA in the client configuration
    
    NetworkManager complains that it cannot use <ca>...</ca> when
    <pkcs12>...</pkcs12> is being used as well. This makes somehwat sense as
    the PKCS12 container also contains the CA certificate.
    
    Therefore we are removing the <ca>...</ca> block for all clients as they
    must all be able to read the PKCS12 container.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/ovpnmain.cgi | 10 ----------
 1 file changed, 10 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index dd4f98246..e53bd6e28 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2479,16 +2479,6 @@ END
 			print "providers legacy default\n";
 		}
 
-		# CA
-		open(FILE, "<${General::swroot}/ovpn/ca/cacert.pem");
-		print "\n<ca>\n";
-		while (<FILE>) {
-			chomp($_);
-			print "$_\n";
-		}
-		print "</ca>\n";
-		close(FILE);
-
 		# PKCS12
 		open(FILE, "<${General::swroot}/ovpn/certs/${name}.p12");
 		print "\n<pkcs12>\n";


hooks/post-receive
--
IPFire 2.x development tree