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

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

[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  6df18afecf9751c5ac731aec01d5dec93b02546b (commit)
       via  5ccc752c65669e845e233cdcd866496741bac374 (commit)
       via  e882edd5f5224479c5257a11a402495388e90113 (commit)
      from  f8206f3c9d3a078da52fbe0fd73387ea64736286 (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 6df18afecf9751c5ac731aec01d5dec93b02546b
Author: Peer Dietzmann <dietzmann@brecht-schule.hamburg>
Date:   Tue Jun 2 13:39:14 2026 +0000

    OpenVPN: Replace configuration download logo
    
    This shows the OpenVPN logo which should make it clearer what people
    will actually be downloading.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 5ccc752c65669e845e233cdcd866496741bac374
Author: Peer Dietzmann <dietzmann@brecht-schule.hamburg>
Date:   Mon Jun 1 21:57:31 2026 +0200

    ovpnmain.cgi: Add collumn for subnet
    
    Hello,
    
    in an earlier version of IPFire the main OVPN page of the WUI showed the subnet of each client in separate tables. Since the upgrade of OpenVPN 2.6 this feature has been removed.
    
    As I find it very useful to see directly on the first page to which subnet a client belongs, this patch should bring back this feature.
    I think this is also something users requested multiple timesin the forum.
    
    There is just one thing I am currently unsure how to handle: When a client belongs to the dynamic subnet, the current patch would display "dynamic" independent from the language of the WUI. Maybe this could be adjusted?
    
    Best regards
    Peer
    
    Signed-off-by: Peer Dietzmann <dietzmann@brecht-schule.hamburg>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit e882edd5f5224479c5257a11a402495388e90113
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Tue Jun 2 13:33:38 2026 +0000

    sysklogd: Listen on localhost
    
    This is required for some services to deliver their syslog messages. For
    example haproxy which is running in chroot and does not have access to
    /dev/log.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/203/filelists/files |   1 +
 html/cgi-bin/ovpnmain.cgi                 |   6 ++++++
 html/html/images/openvpn.png              | Bin 3346 -> 720 bytes
 src/initscripts/system/sysklogd           |   2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/203/filelists/files b/config/rootfiles/core/203/filelists/files
index c70a6c156d..dd3435411f 100644
--- a/config/rootfiles/core/203/filelists/files
+++ b/config/rootfiles/core/203/filelists/files
@@ -10,6 +10,7 @@ etc/rc.d/init.d/networking/red.up/25-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/26-time
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/setclock
+etc/rc.d/init.d/sysklogd
 etc/rc.d/init.d/waitfordns
 etc/rc.d/rc0.d/K86knot-resolver
 etc/rc.d/rc3.d/S11knot-resolver
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 35f6031e6c..3e6185ca6f 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5223,6 +5223,9 @@ END
 				<th>
 					$Lang::tr{'remark'}
 				</th>
+				<th width='10%'>
+					$Lang::tr{'ccd subnet'}
+				</th>
 				<th width='10%'>
 					$Lang::tr{'status'}
 				</th>
@@ -5291,6 +5294,9 @@ END
 		# Show remarks
 		print "<td>$confighash{$key}[25]</td>";
 
+		# Show subnet
+		print "<td class='text-center'>$confighash{$key}[32]</td>";
+
 		my $connstatus = "DISCONNECTED";
 
 		# Disabled Connections
diff --git a/html/html/images/openvpn.png b/html/html/images/openvpn.png
index 4101a068ef..74882f1e38 100644
Binary files a/html/html/images/openvpn.png and b/html/html/images/openvpn.png differ
diff --git a/src/initscripts/system/sysklogd b/src/initscripts/system/sysklogd
index 2590df4ef2..c2531b1eb3 100644
--- a/src/initscripts/system/sysklogd
+++ b/src/initscripts/system/sysklogd
@@ -25,7 +25,7 @@
 case "${1}" in
 	start)
 		boot_mesg "Starting system log daemon..."
-		loadproc syslogd -s -m 0 -r -k
+		loadproc syslogd -m 0 -r -k -b 127.0.0.1
 
 		boot_mesg "Saving Bootlog..."
 		if [ -e /var/log/bootlog ]; then


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