From: Arne Fitzenreiter <arne_f@ipfire.org>
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=-c

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

9b86a7ec28bd2a2049e771b59dff817c0569e106
diff --combined config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel
index 0000000000,6a00446f4d..6a00446f4d
mode 000000,100644..100644
--- a/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel
+++ b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel
@@@ -1,0 -1,2 +1,2 @@@
+ boot/boot.cmd
+ boot/boot.scr
diff --combined config/rootfiles/oldcore/127/filelists/bind
index 0000000000,48a0ebaefd..48a0ebaefd
mode 000000,120000..120000
--- a/config/rootfiles/oldcore/127/filelists/bind
+++ b/config/rootfiles/oldcore/127/filelists/bind
@@@ -1,0 -1,1 +1,1 @@@
+ ../../../common/bind
diff --combined config/rootfiles/oldcore/127/filelists/files
index 4b001af63a,e28d420061..e28d420061
--- a/config/rootfiles/oldcore/127/filelists/files
+++ b/config/rootfiles/oldcore/127/filelists/files
@@@ -16,5 -16,7 +16,7 @@@ srv/web/ipfire/cgi-bin/ovpnmain.cg
  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 --combined config/rootfiles/oldcore/127/update.sh
index 4fe045ec99,e276e7e684..e276e7e684
--- a/config/rootfiles/oldcore/127/update.sh
+++ b/config/rootfiles/oldcore/127/update.sh
@@@ -17,7 -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 +48,14 @@@ ldconfi
  # 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 +66,12 @@@ sysctl -
  # 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