From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cSwgx6mn5z2yXK for ; Fri, 19 Sep 2025 15:01:33 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cSwgx6fSPz2xM3 for ; Fri, 19 Sep 2025 15:01:33 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cSwgx4ZD4z2Vt for ; Fri, 19 Sep 2025 15:01:33 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1758294093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=6P8XahC0+qtkCjIEbVi6aV48xzult+T8n8EDpA0z0PI=; b=DNv6hL4RVI9oZ12isDl6uPBQNKmCL8q2bnMiFJbEcdW/OgwXhR6610SUqumm3Ck+0HlNiu ZkUqbifQWlT5lXAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1758294093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=6P8XahC0+qtkCjIEbVi6aV48xzult+T8n8EDpA0z0PI=; b=buhyEDHSpA01uaiVgo/xY47snKElwwYgG87lp5tJeH0OvBmpUJRdiC1NmthOkSmW6OeH5v Skidtu8FQ0341scx12y5pmwAo1nAsadLkn+Rr0ejK7TpdCykSMATVy5VCc2sgBcNG4XTOJ 0BWjmbPpvFkXtsRls05HKh5I33Yv3nPW0uDTl6nXbVG6PJbyJnSj3bNYMqtlDA3kSW/I50 8zlhpFZUh9XgUJycXQAa2scVYgw67gM5u1NlTrjfkq23xv3gMWQTtx2rDI/5eWF5MO3PYu QvOHwCQpkTTGaXiJM4f3E7r71ueftbZiYxVYWH/7y4RlE8IQMyFhOemM6PnE8Q== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4cSwgx3jVPz2xpB; Fri, 19 Sep 2025 15:01:33 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 02dfa2e99ed48033b55b0d106b16d9bf5cd43c9d X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 3dbd9bab31ef3e41eccb7a67ff7616966d5130ae X-Git-Newrev: 02dfa2e99ed48033b55b0d106b16d9bf5cd43c9d Message-Id: <4cSwgx3jVPz2xpB@people01.haj.ipfire.org> Date: Fri, 19 Sep 2025 15:01:33 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 02dfa2e99ed48033b55b0d106b16d9bf5cd43c9d (commit) via 9eaae72637d9c98036bc521ff137fa3662d556b4 (commit) via 3c509e6ce899cf264e24b0e6357aac7730c71c85 (commit) via 26f600100f173335b019221c4fc29b805190f99f (commit) via 124f2f2fa5dabbb27d57513cfa2c689dbf106425 (commit) via 8d69563fb048ec7aecd116947a72516b79dbd3bf (commit) via 44ea44efd6ce52eec09573da3a007b26e44dfbe5 (commit) from 3dbd9bab31ef3e41eccb7a67ff7616966d5130ae (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 02dfa2e99ed48033b55b0d106b16d9bf5cd43c9d Merge: 3dbd9bab3 9eaae7263 Author: Michael Tremer Date: Fri Sep 19 16:01:21 2025 +0100 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/httpd/vhosts.d/ipfire-interface-ssl.conf | 2 +- config/rootfiles/oldcore/197/filelists/files | 1 + config/wio/wio.pl | 2 +- config/wio/wiovpn.pl | 2 +- html/cgi-bin/ids.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/wio.cgi | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index 17a916ff3..ae6b360fd 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -27,7 +27,7 @@ Header always set X-Frame-Options sameorigin - Options ExecCGI + Options ExecCGI FollowSymLinks AllowOverride None Require all granted diff --git a/config/rootfiles/oldcore/197/filelists/files b/config/rootfiles/oldcore/197/filelists/files index 8e79a54c4..c25eb4b8e 100644 --- a/config/rootfiles/oldcore/197/filelists/files +++ b/config/rootfiles/oldcore/197/filelists/files @@ -16,6 +16,7 @@ etc/sysconfig/createfiles lib/udev/network-hotplug-master lib/udev/network-hotplug-rename lib/udev/rules.d/60-net.rules +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/config/wio/wio.pl b/config/wio/wio.pl index 78c91eeb9..8efbe600f 100644 --- a/config/wio/wio.pl +++ b/config/wio/wio.pl @@ -82,7 +82,7 @@ if ( -e $rediface ) { my $redip = $hostname; my $vpnpid = ( -e "/var/run/charon.pid" ? `awk '{print $1}' /var/run/charon.pid`: ''); -my $ovpnpid = ( -e "/var/run/openvpn.pid" ? `awk '{print $1}' /var/run/openvpn.pid`: ''); +my $ovpnpid = ( -e "/var/run/openvpn-rw.pid" ? `awk '{print $1}' /var/run/openvpn-rw.pid`: ''); my $steptime = $wiosettings{'CRON'} *= 60; my $i_ping = 'icmp'; diff --git a/config/wio/wiovpn.pl b/config/wio/wiovpn.pl index 80b020dc9..279b858b4 100644 --- a/config/wio/wiovpn.pl +++ b/config/wio/wiovpn.pl @@ -51,7 +51,7 @@ my $logging = $wiosettings{'LOGGING'}; my ( @ovpnstatus, @ovpncfg, @ovpncache, @ovpnarray, @ovpnmatch, @ovpnwrite ); my $now = strftime "%a, %d.%m.%Y %H:%M:%S", localtime; -my $ovpnpid = "/var/run/openvpn.pid"; +my $ovpnpid = "/var/run/openvpn-rw.pid"; my $ovpnmailmsg = ''; my $ovpncache = "/var/log/wio/.ovpncache"; my $ovpnconfig = "/var/ipfire/ovpn/ovpnconfig"; diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 30a1613c7..994872564 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -57,7 +57,7 @@ my @network_zones = &Network::get_available_network_zones(); push(@network_zones, "ipsec", "wg"); # Check if openvpn is started and add it to the array of network zones. -if ( -e "/var/run/openvpn.pid") { +if ( -e "/var/run/openvpn-rw.pid") { push(@network_zones, "ovpn"); } diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index fef135aa2..b63e5752c 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -128,7 +128,7 @@ my $col=""; # Advanced Settings "DPROTOCOL" => "udp", "DDEST_PORT" => 1194, - "DMTU" => 1500, + "DMTU" => 1420, "MAX_CLIENTS" => 100, "MSSFIX" => "off", "TLSAUTH" => "on", diff --git a/html/cgi-bin/wio.cgi b/html/cgi-bin/wio.cgi index d988ec597..9975c294d 100644 --- a/html/cgi-bin/wio.cgi +++ b/html/cgi-bin/wio.cgi @@ -84,7 +84,7 @@ my $rrddir = "/var/log/rrd/wio"; my $refreshbox = ''; my $sortstring = '^IPADR|^HOST'; my $ovpnaddon = "/var/ipfire/ovpn"; -my $ovpnpid = "/var/run/openvpn.pid"; +my $ovpnpid = "/var/run/openvpn-rw.pid"; my $vpnpid = "/var/run/charon.pid"; my $redactive = "/var/ipfire/red/active"; my $redip = '-'; hooks/post-receive -- IPFire 2.x development tree