From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 02dfa2e99ed48033b55b0d106b16d9bf5cd43c9d
Date: Fri, 19 Sep 2025 15:01:33 +0000 (UTC) [thread overview]
Message-ID: <4cSwgx3jVPz2xpB@people01.haj.ipfire.org> (raw)
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 <michael.tremer@ipfire.org>
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
<Directory /srv/web/ipfire/html>
- Options ExecCGI
+ Options ExecCGI FollowSymLinks
AllowOverride None
Require all granted
</Directory>
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 = '<meta http-equiv="refresh" content="0;url=/cgi-bin/wio.cgi">';
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
reply other threads:[~2025-09-19 15:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4cSwgx3jVPz2xpB@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox