webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-01 15:52:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Stefan Schantl
2018-06-27 19:33:43 +02:00
parent 5776b677db bc91a66281
commit 74c193f266
917 changed files with 72690 additions and 101956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
config/rootfiles/core/117/filelists/files
View File

@@ -1,18 +0,0 @@
etc/system-release
etc/issue
etc/ssl/certs/ca-bundle.crt
etc/ssl/certs/ca-bundle.trust.crt
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/country.cgi
srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
srv/web/ipfire/cgi-bin/routing.cgi
srv/web/ipfire/html/themes/darkdos/include/functions.pl
srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/maniac/include/functions.pl
usr/local/bin/captivectrl
var/ipfire/geoip-functions.pl
var/ipfire/network-functions.pl

1
config/rootfiles/core/117/meta
View File

@@ -1 +0,0 @@
DEPS=""

0
config/rootfiles/core/117/exclude → config/rootfiles/core/123/exclude
View File

1
config/rootfiles/core/123/filelists/coreutils Symbolic link
View File

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

7
config/rootfiles/core/123/filelists/files Normal file
View File

@@ -0,0 +1,7 @@
etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
var/ipfire/backup/exclude
var/ipfire/langs

1
config/rootfiles/core/123/filelists/gnupg Symbolic link
View File

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

1
config/rootfiles/core/123/filelists/iana-etc Symbolic link
View File

@@ -0,0 +1 @@
../../../common/iana-etc

1
config/rootfiles/core/123/filelists/ipset Symbolic link
View File

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

1
config/rootfiles/core/123/filelists/libgcrypt Symbolic link
View File

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

1
config/rootfiles/core/123/filelists/tzdata Symbolic link
View File

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

1
config/rootfiles/core/123/filelists/unbound Symbolic link
View File

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

9
config/rootfiles/core/117/update.sh → config/rootfiles/core/123/update.sh
View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
core=117
core=123
# Remove old core updates from pakfire cache to save space...
for (( i=1; i<=$core; i++ )); do
@@ -40,12 +40,13 @@ extract_files
ldconfig
# Update Language cache
#/usr/local/bin/update-lang-cache
/usr/local/bin/update-lang-cache
# Start services
/etc/init.d/unbound restart
# This update need a reboot...
#touch /var/run/need_reboot
# This update needs a reboot...
touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start