From c5ecfbe3f1cb1adc4d8ad04c97a5d749dd5a3f1a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 15 Jul 2025 09:57:16 +0000 Subject: [PATCH] core197: Ship OpenVPN changes Signed-off-by: Michael Tremer --- config/rootfiles/core/197/filelists/files | 17 +++++++++++++++++ config/rootfiles/core/197/filelists/openvpn | 1 + config/rootfiles/core/197/update.sh | 8 ++++++++ lfs/tor | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) create mode 120000 config/rootfiles/core/197/filelists/openvpn diff --git a/config/rootfiles/core/197/filelists/files b/config/rootfiles/core/197/filelists/files index 05a321526..b197f3f2a 100644 --- a/config/rootfiles/core/197/filelists/files +++ b/config/rootfiles/core/197/filelists/files @@ -1,4 +1,21 @@ etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/rc.d/init.d/firewall +etc/rc.d/init.d/functions +etc/rc.d/init.d/openvpn-n2n +etc/rc.d/init.d/openvpn-rw +etc/rc.d/rc0.d/K10openvpn-rw +etc/rc.d/rc0.d/K11openvpn-n2n +etc/rc.d/rc3.d/S50openvpn-rw +etc/rc.d/rc3.d/S51openvpn-n2n +etc/rc.d/rc6.d/K10openvpn-rw +etc/rc.d/rc6.d/K11openvpn-n2n +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/vulnerabilities.cgi +srv/web/ipfire/html/themes/ipfire/include/css/style.css +usr/local/bin/openvpnctrl +var/ipfire/general-functions.pl +var/ipfire/header.pl var/ipfire/langs/list var/ipfire/menu.d/20-status.menu var/ipfire/menu.d/40-services.menu diff --git a/config/rootfiles/core/197/filelists/openvpn b/config/rootfiles/core/197/filelists/openvpn new file mode 120000 index 000000000..493f3f7a4 --- /dev/null +++ b/config/rootfiles/core/197/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/197/update.sh b/config/rootfiles/core/197/update.sh index 311bddb85..30d618b0e 100644 --- a/config/rootfiles/core/197/update.sh +++ b/config/rootfiles/core/197/update.sh @@ -32,9 +32,13 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/usr/local/bin/openvpnctrl -k +/usr/local/bin/openvpnctrl -kn2n # Remove files rm -vf \ + /etc/rc.d/init.d/networking/red.down/10-ovpn \ + /etc/rc.d/init.d/networking/red.up/50-ovpn \ /usr/lib/libbtrfs.so.0.? \ /usr/lib/libbtrfsutil.so.1.? @@ -53,6 +57,10 @@ ldconfig # Apply SSH configuration /usr/local/bin/sshctrl +# Start services +/etc/init.d/openvpn-n2n start +/etc/init.d/openvpn-rw start + # Reload Apache2 /etc/init.d/apache reload diff --git a/lfs/tor b/lfs/tor index 980c1a8f5..0d57f5fed 100644 --- a/lfs/tor +++ b/lfs/tor @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 88 +PAK_VER = 89 DEPS = libseccomp -- 2.47.3