Merge branch 'master' into core119
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Apr 2018 14:56:02 +0000 (16:56 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Apr 2018 14:56:02 +0000 (16:56 +0200)
1  2 
config/rootfiles/core/120/filelists/files

@@@ -7,8 -7,8 +7,9 @@@ etc/rc.d/init.d/pakfir
  etc/rc.d/init.d/unbound
  etc/rc.d/rcsysinit.d/S81pakfire
  opt/pakfire/lib/functions.pl
- opt/pakfire/pakfire.key
 +opt/pakfire/pakfire
+ opt/pakfire/pakfire-2007.key
+ opt/pakfire/pakfire-2018.key
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
  srv/web/ipfire/cgi-bin/proxy.cgi
  srv/web/ipfire/cgi-bin/qos.cgi