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

[Michael Tremer <git@ipfire.org>]

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  750377a96a2a380449d6612ddc2661cb782215ab (commit)
       via  8d611ffd0424ba20aac45f63f5bdaa398b4cb557 (commit)
       via  3e82d9990cbdd4b0f022e16aecec164008926717 (commit)
       via  4c0b4194ff24e4ddeb8a1311facfec71d2101a39 (commit)
       via  87e1047a08ca522f28807b3fde7a2f2faa75b733 (commit)
       via  1f200cb1c9ec0f4c9196d44f2f2c92d3403a8aae (commit)
      from  eefffac970c071a6626fbfb431e29387b14a1b46 (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 750377a96a2a380449d6612ddc2661cb782215ab
Merge: eefffac97 8d611ffd0
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Thu Aug 14 10:06:01 2025 +0000

    Merge branch 'master' into next

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

Summary of changes:
 config/backup/backup.pl                      | 27 +--------------------------
 config/rootfiles/oldcore/196/filelists/files |  1 +
 config/rootfiles/oldcore/197/update.sh       | 27 +--------------------------
 html/cgi-bin/ovpnmain.cgi                    | 10 ++++++++--
 4 files changed, 11 insertions(+), 54 deletions(-)

Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index ed7a68455..c9bc14355 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -350,32 +350,7 @@ restore_backup() {
 	fi
 
 	# Update the OpenVPN configuration
-	sed -r \
-		-e "s/^writepid .*/writepid \/var\/run\/openvpn-rw.pid/" \
-		-e "/ncp-disable/d" \
-		-e "s/^cipher (.*)/data-ciphers-fallback \1/" \
-		-e "s/^status .*/status \/var\/run\/openvpn-rw.log/" \
-		-i /var/ipfire/ovpn/server.conf
-
-	# Change to the subnet topology
-	if ! grep -q "topology subnet" /var/ipfire/ovpn/server.conf; then
-		echo "topology subnet" >> /var/ipfire/ovpn/server.conf
-	fi
-
-	# Migrate away from compression
-	if ! grep -q "compress migrate" /var/ipfire/ovpn/server.conf; then
-		echo "compress migrate" >> /var/ipfire/ovpn/server.conf
-	fi
-
-	# Enable the legacy provider (just in case)
-	if ! grep -q "providers legacy default" /var/ipfire/ovpn/server.conf; then
-		echo "providers legacy default" >> /var/ipfire/ovpn/server.conf
-	fi
-
-	# Enable explicit exit notification
-	if ! grep -q "explicit-exit-notify" /var/ipfire/ovpn/server.conf; then
-		echo "explicit-exit-notify" >> /var/ipfire/ovpn/server.conf
-	fi
+	sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi
 
 	return 0
 }
diff --git a/config/rootfiles/oldcore/196/filelists/files b/config/rootfiles/oldcore/196/filelists/files
index e383a991d..a4be28a89 100644
--- a/config/rootfiles/oldcore/196/filelists/files
+++ b/config/rootfiles/oldcore/196/filelists/files
@@ -16,4 +16,5 @@ var/ipfire/graphs.pl
 var/ipfire/header.pl
 var/ipfire/ipblocklist-functions.pl
 var/ipfire/langs/list
+var/ipfire/main/manualpages
 var/ipfire/wireguard-functions.pl
diff --git a/config/rootfiles/oldcore/197/update.sh b/config/rootfiles/oldcore/197/update.sh
index dc9149499..0fd5cc6f0 100644
--- a/config/rootfiles/oldcore/197/update.sh
+++ b/config/rootfiles/oldcore/197/update.sh
@@ -123,32 +123,7 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
 
 # Update the OpenVPN configuration
-sed -r \
-	-e "s/^writepid .*/writepid \/var\/run\/openvpn-rw.pid/" \
-	-e "/ncp-disable/d" \
-	-e "s/^cipher (.*)/data-ciphers-fallback \1/" \
-	-e "s/^status .*/status \/var\/run\/openvpn-rw.log/" \
-	-i /var/ipfire/ovpn/server.conf
-
-# Change to the subnet topology
-if ! grep -q "topology subnet" /var/ipfire/ovpn/server.conf; then
-	echo "topology subnet" >> /var/ipfire/ovpn/server.conf
-fi
-
-# Migrate away from compression
-if ! grep -q "compress migrate" /var/ipfire/ovpn/server.conf; then
-	echo "compress migrate" >> /var/ipfire/ovpn/server.conf
-fi
-
-# Enable the legacy provider (just in case)
-if ! grep -q "providers legacy default" /var/ipfire/ovpn/server.conf; then
-	echo "providers legacy default" >> /var/ipfire/ovpn/server.conf
-fi
-
-# Enable explicit exit notification
-if ! grep -q "explicit-exit-notify" /var/ipfire/ovpn/server.conf; then
-	echo "explicit-exit-notify" >> /var/ipfire/ovpn/server.conf
-fi
+sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi
 
 # Apply SSH configuration
 /usr/local/bin/sshctrl
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 1fe0978c6..83f9fdc02 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -41,8 +41,8 @@ require "${General::swroot}/countries.pl";
 require "${General::swroot}/location-functions.pl";
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -1001,6 +1001,12 @@ sub openvpn_status($) {
 	return $status;
 }
 
+# Hook to regenerate the configuration files
+if ($ENV{"REMOTE_ADDR"} eq "") {
+	&writeserverconf();
+	exit(0);
+}
+
 ###
 ### Save Advanced options
 ###


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