Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2024-03-31 13:36:08 +02:00
38 changed files with 421 additions and 66 deletions

View File

@@ -0,0 +1 @@
../../../../common/aarch64/boost

View File

@@ -0,0 +1 @@
../../../../common/aarch64/grub

View File

@@ -0,0 +1 @@
../../../common/apache2

View File

@@ -0,0 +1 @@
../../../common/collectd

View File

@@ -50,6 +50,7 @@ srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/time.cgi
usr/lib/python3.10/lib-dynload/_lzma.cpython-310-xxxMACHINExxx-linux-gnu.so
usr/local/bin/update-ids-ruleset
var/ipfire/backup/bin/backup.pl
var/ipfire/ids-functions.pl

View File

@@ -0,0 +1 @@
../../../common/kmod

View File

@@ -0,0 +1 @@
../../../common/libarchive

View File

@@ -0,0 +1 @@
../../../common/libtiff

View File

@@ -0,0 +1 @@
../../../common/libxml2

View File

@@ -0,0 +1 @@
../../../common/perl-Archive-Peek-Libarchive

View File

@@ -0,0 +1 @@
../../../common/perl-Capture-Tiny

View File

@@ -0,0 +1 @@
../../../common/perl-Config-AutoConf

View File

@@ -0,0 +1 @@
../../../common/perl-Object-Tiny

View File

@@ -0,0 +1 @@
../../../../common/riscv64/boost

View File

@@ -0,0 +1 @@
../../../../common/riscv64/grub

View File

@@ -0,0 +1 @@
../../../../common/x86_64/boost

View File

@@ -0,0 +1 @@
../../../../common/x86_64/grub

View File

@@ -67,7 +67,8 @@ rm -rvf \
/var/ipfire/geoip-functions.pl \
/var/ipfire/dhcpc/dhcpcd-hooks/00-linux \
/var/ipfire/dhcpc/dhcpcd-hooks/02-dump \
/var/lib/location/tmp*
/var/lib/location/tmp* \
/usr/lib/liblzma.so.5.6.*
# update linker config
ldconfig
@@ -88,12 +89,15 @@ chmod -v 640 /etc/sudoers.d/*
# Start services
telinit u
/etc/init.d/sshd restart
/etc/init.d/apache restart
/etc/init.d/suricata restart
/etc/init.d/unbound restart
/etc/init.d/ntp start
if [ -f /var/ipfire/proxy/enable ]; then
/etc/init.d/squid start
fi
/etc/init.d/collectd restart
## Modify ovpnconfig according to bug 13548 for no-pass entry for N2N client connections
# Check if ovpnconfig exists and is not empty
if [ -s /var/ipfire/ovpn/ovpnconfig ]; then