Merge branch 'next' into temp-c171-development

This commit is contained in:
Peter Müller
2022-09-11 08:20:29 +00:00
10 changed files with 35 additions and 8 deletions

View File

@@ -4,7 +4,9 @@ opt/pakfire/pakfire
srv/web/ipfire/cgi-bin/aliases.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ipblocklist.cgi
srv/web/ipfire/cgi-bin/mail.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/vulnerabilities.cgi
@@ -22,6 +24,7 @@ usr/share/terminfo/t/tmux-256color
usr/share/terminfo/t/tmux-direct
var/ipfire/backup/bin/backup.pl
var/ipfire/backup/include
var/ipfire/general-functions.pl
var/ipfire/ipblocklist-functions.pl
var/ipfire/menu.d/50-firewall.menu
var/ipfire/menu.d/70-log.menu

View File

@@ -164,6 +164,10 @@ ldconfig
mkdir -pv /var/lib/ipblocklist
chown nobody:nobody /var/lib/ipblocklist
# Create necessary files for IPBlocklist and set their ownership accordingly (#12917)
touch /var/ipfire/ipblocklist/{settings,modified}
chown nobody:nobody /var/ipfire/ipblocklist/{settings,modified}
# Rebuild fcrontab from scratch
/usr/bin/fcrontab -z