From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 18:58:48 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=9b86a7ec28bd2a2049e771b59dff817c0569e106;hp=93d516bd7065e4a30a1a04bd3f1045b2b56864ad Merge remote-tracking branch 'origin/master' into next --- diff --git a/config/rootfiles/oldcore/127/filelists/aarch64/files b/config/rootfiles/oldcore/127/filelists/aarch64/files deleted file mode 100644 index d76f3915c9..0000000000 --- a/config/rootfiles/oldcore/127/filelists/aarch64/files +++ /dev/null @@ -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 diff --git a/config/rootfiles/oldcore/127/filelists/armv5tel/files b/config/rootfiles/oldcore/127/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/oldcore/127/filelists/armv5tel/files rename to config/rootfiles/oldcore/127/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel new file mode 100644 index 0000000000..6a00446f4d --- /dev/null +++ b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel @@ -0,0 +1,2 @@ +boot/boot.cmd +boot/boot.scr diff --git a/config/rootfiles/oldcore/127/filelists/bind b/config/rootfiles/oldcore/127/filelists/bind new file mode 120000 index 0000000000..48a0ebaefd --- /dev/null +++ b/config/rootfiles/oldcore/127/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/127/filelists/files b/config/rootfiles/oldcore/127/filelists/files index 4b001af63a..e28d420061 100644 --- a/config/rootfiles/oldcore/127/filelists/files +++ b/config/rootfiles/oldcore/127/filelists/files @@ -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 diff --git a/config/rootfiles/oldcore/127/update.sh b/config/rootfiles/oldcore/127/update.sh index 4fe045ec99..e276e7e684 100644 --- a/config/rootfiles/oldcore/127/update.sh +++ b/config/rootfiles/oldcore/127/update.sh @@ -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 . # +# Copyright (C) 2019 IPFire-Team . # # # ############################################################################ # @@ -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 diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update index 73484c7a06..b45c5b3436 100644 --- a/src/scripts/xt_geoip_update +++ b/src/scripts/xt_geoip_update @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 IPFire Development Team # +# Copyright (C) 2019 IPFire Development Team # # # # 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)