webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2019-01-19 19:58:48 +01:00
parent 93d516bd70 f29ff21cd6
commit 9b86a7ec28
7 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/rootfiles/oldcore/127/filelists/aarch64/files
View File

@@ -1,9 +0,0 @@
boot/boot.cmd
boot/boot.scr
etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
etc/rc.d/init.d/aws
etc/rc.d/init.d/unbound
srv/web/ipfire/cgi-bin/dnsforward.cgi

0
config/rootfiles/oldcore/127/filelists/armv5tel/files → config/rootfiles/oldcore/127/filelists/aarch64/files-aarch64
View File

2
config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel Normal file
View File

@@ -0,0 +1,2 @@
boot/boot.cmd
boot/boot.scr

1
config/rootfiles/oldcore/127/filelists/bind Symbolic link
View File

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

2
config/rootfiles/oldcore/127/filelists/files
View File

@@ -16,5 +16,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/lib/firewall/firewall-lib.pl
usr/local/bin/xt_geoip_update
var/ipfire/backup/include
var/ipfire/general-functions.pl
var/ipfire/geoip-functions.pl

16
config/rootfiles/oldcore/127/update.sh
View File

@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2018 IPFire-Team <info@ipfire.org>. #
# Copyright (C) 2019 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
@@ -48,6 +48,14 @@ ldconfig
# Regenerate squid configuration file
sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
# If not exist create ovpn ca index.txt(.attr) and fix rights
touch /var/ipfire/ovpn/ca/index.txt.attr
chmod 644 /var/ipfire/ovpn/ca/index.txt.attr
chown nobody:nobody /var/ipfire/ovpn/ca/index.txt.attr
touch /var/ipfire/ovpn/ca/index.txt
chmod 644 /var/ipfire/ovpn/ca/index.txt
chown nobody:nobody /var/ipfire/ovpn/ca/index.txt
# Start services
/etc/init.d/unbound restart
/etc/init.d/squid start
@@ -58,6 +66,12 @@ sysctl -p
# Re-run depmod
depmod -a
# Update xt_geoip
/usr/local/bin/xt_geoip_update
# This update needs a reboot...
touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start
sendprofile

4
src/scripts/xt_geoip_update
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2014 IPFire Development Team <info@ipfire.org> #
# Copyright (C) 2019 IPFire Development Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -26,7 +26,7 @@ SCRIPT_PATH=/usr/local/bin
DEST_PATH=/usr/share/xt_geoip
DB_PATH=/var/lib/GeoIP
DL_URL=http://geolite.maxmind.com/download/geoip/database/
DL_URL=http://geolite.maxmind.com/download/geoip/database
DL_FILE=GeoLite2-Country-CSV.zip
eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)