mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-03 08:42:55 +02:00
Merge remote-tracking branch 'origin/master' into next
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
1
config/rootfiles/oldcore/185/filelists/aarch64/boost
Symbolic link
1
config/rootfiles/oldcore/185/filelists/aarch64/boost
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/aarch64/boost
|
||||
1
config/rootfiles/oldcore/185/filelists/aarch64/grub
Symbolic link
1
config/rootfiles/oldcore/185/filelists/aarch64/grub
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/aarch64/grub
|
||||
1
config/rootfiles/oldcore/185/filelists/apache2
Symbolic link
1
config/rootfiles/oldcore/185/filelists/apache2
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/apache2
|
||||
1
config/rootfiles/oldcore/185/filelists/collectd
Symbolic link
1
config/rootfiles/oldcore/185/filelists/collectd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/collectd
|
||||
@@ -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
|
||||
|
||||
1
config/rootfiles/oldcore/185/filelists/kmod
Symbolic link
1
config/rootfiles/oldcore/185/filelists/kmod
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/kmod
|
||||
1
config/rootfiles/oldcore/185/filelists/libarchive
Symbolic link
1
config/rootfiles/oldcore/185/filelists/libarchive
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/libarchive
|
||||
1
config/rootfiles/oldcore/185/filelists/libtiff
Symbolic link
1
config/rootfiles/oldcore/185/filelists/libtiff
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/libtiff
|
||||
1
config/rootfiles/oldcore/185/filelists/libxml2
Symbolic link
1
config/rootfiles/oldcore/185/filelists/libxml2
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/libxml2
|
||||
@@ -0,0 +1 @@
|
||||
../../../common/perl-Archive-Peek-Libarchive
|
||||
1
config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny
Symbolic link
1
config/rootfiles/oldcore/185/filelists/perl-Capture-Tiny
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/perl-Capture-Tiny
|
||||
1
config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf
Symbolic link
1
config/rootfiles/oldcore/185/filelists/perl-Config-AutoConf
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/perl-Config-AutoConf
|
||||
1
config/rootfiles/oldcore/185/filelists/perl-Object-Tiny
Symbolic link
1
config/rootfiles/oldcore/185/filelists/perl-Object-Tiny
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/perl-Object-Tiny
|
||||
1
config/rootfiles/oldcore/185/filelists/riscv64/boost
Symbolic link
1
config/rootfiles/oldcore/185/filelists/riscv64/boost
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/riscv64/boost
|
||||
1
config/rootfiles/oldcore/185/filelists/riscv64/grub
Symbolic link
1
config/rootfiles/oldcore/185/filelists/riscv64/grub
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/riscv64/grub
|
||||
1
config/rootfiles/oldcore/185/filelists/x86_64/boost
Symbolic link
1
config/rootfiles/oldcore/185/filelists/x86_64/boost
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/boost
|
||||
1
config/rootfiles/oldcore/185/filelists/x86_64/grub
Symbolic link
1
config/rootfiles/oldcore/185/filelists/x86_64/grub
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/grub
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user