webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-15 13:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,185 Commits 2 Branches 1 Tag
00a031145e32d31a08037dda3c8a3cc7cc6c815e
Commit Graph

2003 Commits

Author SHA1 Message Date
Stefan Schantl
fb22c9ffd9 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-07-08 08:34:37 +02:00
Arne Fitzenreiter
37458540bf collect: fix cpufreq graph on some machines. 
the file cpuinfo_cur_freq does not exist on all systems that support collect
cpufreq data.

fixes #11739
 2018-07-03 15:09:40 +02:00
Arne Fitzenreiter
64252706ce Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2018-07-03 11:52:18 +01:00
Arne Fitzenreiter
1ac0d5c598 Merge branch 'aarch64' into next 
Conflicts:
	config/rootfiles/core/121/filelists/acpid
	config/rootfiles/core/121/filelists/apache2
	config/rootfiles/core/121/filelists/apr
	config/rootfiles/core/121/filelists/aprutil
	config/rootfiles/core/121/filelists/armv5tel/files
	config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/linux-multi
	config/rootfiles/core/121/filelists/armv5tel/rpi-firmware
	config/rootfiles/core/121/filelists/armv5tel/u-boot
	config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/core/121/filelists/beep
	config/rootfiles/core/121/filelists/cmake
	config/rootfiles/core/121/filelists/crda
	config/rootfiles/core/121/filelists/dhcp
	config/rootfiles/core/121/filelists/flex
	config/rootfiles/core/121/filelists/i586/grub
	config/rootfiles/core/121/filelists/i586/intel-microcode
	config/rootfiles/core/121/filelists/i586/linux
	config/rootfiles/core/121/filelists/i586/linux-initrd
	config/rootfiles/core/121/filelists/iw
	config/rootfiles/core/121/filelists/jwhois
	config/rootfiles/core/121/filelists/libidn
	config/rootfiles/core/121/filelists/multipath-tools
	config/rootfiles/core/121/filelists/pcre
	config/rootfiles/core/121/filelists/tar
	config/rootfiles/core/121/filelists/unbound
	config/rootfiles/core/121/filelists/wget
	config/rootfiles/core/121/filelists/x86_64/grub
	config/rootfiles/core/121/filelists/x86_64/intel-microcode
	config/rootfiles/core/121/filelists/x86_64/linux
	config/rootfiles/core/121/filelists/x86_64/linux-initrd
	config/rootfiles/core/122/filelists/aarch64/files
	config/rootfiles/core/122/filelists/acpid
	config/rootfiles/core/122/filelists/apache2
	config/rootfiles/core/122/filelists/apr
	config/rootfiles/core/122/filelists/aprutil
	config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/linux-multi
	config/rootfiles/core/122/filelists/armv5tel/rpi-firmware
	config/rootfiles/core/122/filelists/armv5tel/u-boot
	config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/core/122/filelists/beep
	config/rootfiles/core/122/filelists/cmake
	config/rootfiles/core/122/filelists/crda
	config/rootfiles/core/122/filelists/dhcp
	config/rootfiles/core/122/filelists/flex
	config/rootfiles/core/122/filelists/i586/grub
	config/rootfiles/core/122/filelists/i586/intel-microcode
	config/rootfiles/core/122/filelists/i586/linux
	config/rootfiles/core/122/filelists/i586/linux-initrd
	config/rootfiles/core/122/filelists/iw
	config/rootfiles/core/122/filelists/jwhois
	config/rootfiles/core/122/filelists/libidn
	config/rootfiles/core/122/filelists/multipath-tools
	config/rootfiles/core/122/filelists/pcre
	config/rootfiles/core/122/filelists/tar
	config/rootfiles/core/122/filelists/unbound
	config/rootfiles/core/122/filelists/wget
	config/rootfiles/core/122/filelists/x86_64/grub
	config/rootfiles/core/122/filelists/x86_64/intel-microcode
	config/rootfiles/core/122/filelists/x86_64/linux
	config/rootfiles/core/122/filelists/x86_64/linux-initrd
	config/rootfiles/core/123/filelists/unbound
	config/rootfiles/oldcore/121/filelists/acpid
	config/rootfiles/oldcore/121/filelists/apache2
	config/rootfiles/oldcore/121/filelists/apr
	config/rootfiles/oldcore/121/filelists/aprutil
	config/rootfiles/oldcore/121/filelists/armv5tel/files
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi
	config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi
	config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood
	config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage
	config/rootfiles/oldcore/121/filelists/beep
	config/rootfiles/oldcore/121/filelists/cmake
	config/rootfiles/oldcore/121/filelists/crda
	config/rootfiles/oldcore/121/filelists/dhcp
	config/rootfiles/oldcore/121/filelists/flex
	config/rootfiles/oldcore/121/filelists/i586/grub
	config/rootfiles/oldcore/121/filelists/i586/intel-microcode
	config/rootfiles/oldcore/121/filelists/i586/linux
	config/rootfiles/oldcore/121/filelists/i586/linux-initrd
	config/rootfiles/oldcore/121/filelists/iw
	config/rootfiles/oldcore/121/filelists/jwhois
	config/rootfiles/oldcore/121/filelists/libidn
	config/rootfiles/oldcore/121/filelists/multipath-tools
	config/rootfiles/oldcore/121/filelists/pcre
	config/rootfiles/oldcore/121/filelists/tar
	config/rootfiles/oldcore/121/filelists/wget
	config/rootfiles/oldcore/121/filelists/x86_64/grub
	config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode
	config/rootfiles/oldcore/121/filelists/x86_64/linux
	config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd
	make.sh
 2018-07-03 11:52:05 +01:00
Michael Tremer
b4208f1845 core123: Ship updated sysctl.conf 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-03 10:33:23 +01:00
Michael Tremer
a65d07ec6d core123: Ship updated usbutils 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-03 10:32:43 +01:00
Michael Tremer
b06e1f696d core123: Ship updated GeoIP.dat 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-03 10:32:08 +01:00
Arne Fitzenreiter
cf7a7a874f Merge remote-tracking branch 'origin/master' into aarch64 2018-07-02 19:07:22 +01:00
Michael Tremer
4d2c384543 core123: Ship changed vpnmain.cgi 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-01 13:34:56 +01:00
Michael Tremer
54e3be22f2 core123: Ship updated packages and files 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-07-01 13:34:19 +01:00
Arne Fitzenreiter
4838034131 random: update initskript for machines with low entropy 
the script wait until crng is correct initialized before restore the
random seed and make some disc io to work around low entropy at boot
on some machines. Not really a fix but it should be better than reverting
CVE-2018-1108 fixes from kernel.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-28 20:48:58 +02:00
Stefan Schantl
74c193f266 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2018-06-27 19:33:43 +02:00
Arne Fitzenreiter
5b17da41c1 kernel: add config for aarch64 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-21 06:20:35 +01:00
Arne Fitzenreiter
2bd9316d9d rpi-firmware: build for aarch64 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-21 06:17:49 +01:00
Arne Fitzenreiter
963f6e973a u-boot: add config for aarch64 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-21 06:12:59 +01:00
Michael Tremer
bc91a66281 core123: Ship updated iana-etc 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-06-19 11:34:38 +01:00
Michael Tremer
1feef6be7c core123: Ship /var/ipfire/backup/exclude 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-06-19 11:31:01 +01:00
Michael Tremer
b1f4acadde core123: Ship updated gnupg 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-06-19 11:30:26 +01:00
Arne Fitzenreiter
9f73293568 core122: run sensors-detect with new kernel 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-19 11:02:51 +02:00
Arne Fitzenreiter
d2f0bae8cb core121/122: update needed diskspace 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-19 10:58:47 +02:00
Michael Tremer
28aacf565b Start Core Update 123 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-06-18 16:43:04 +01:00
Arne Fitzenreiter
a45c7981df core122: update space req for pae kernel 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-16 15:44:11 +02:00
Arne Fitzenreiter
8c67e13fab core122: install updated grub 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-16 13:26:54 +02:00
Arne Fitzenreiter
78aaf71665 core122: add missing "then" at microcode reload 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-16 11:45:32 +02:00
Arne Fitzenreiter
458c7d36cc core-updates: don't restart pakfire at error 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-16 11:36:06 +02:00
Arne Fitzenreiter
a97d2fb794 core122: add code needed for kernel update 
force reinstall pae kernel,
update /boot/uenv.txt

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-15 09:24:50 +02:00
Arne Fitzenreiter
407f18cdbb core121: add files for version update 
setup and pakfire conf needed to ship and pakfire needs to rerun
after the version change to use the new pakfire trees and load core122.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-15 09:12:23 +02:00
Arne Fitzenreiter
8b297455a5 core122: remove arm check 
The update will not pushed to old arm trees so the check is useless

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-15 08:56:23 +02:00
Arne Fitzenreiter
015b3e08d8 core121: split into core121 and 122 
linux firmware and kernel is too large for one core update

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-06-15 08:52:51 +02:00
Michael Tremer
a1fdcfcd0e core121: Reload microcode after installing the core update 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-06-12 17:15:43 +01:00
Michael Tremer
05b2d72588 core121: Create updater 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-06-06 14:03:07 +01:00
Peter Müller
d8ef6a9537 display country data for remote IPs on ovpnmain.cgi 
This makes debugging easier, especially when it comes to
GeoIP related firewall rules and database related issues
such as #11482.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-05-09 14:51:20 +01:00
Peter Müller
ea566f8485 fix aesthetic issues in remote.cgi and ship them 
Fix some minor cosmetic issues on remote.cgi as well as a typo in
the language files ("sesstions" -> "sessions"). The changes are
listed in "filelists" for Core Update 121.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-05-09 14:49:48 +01:00
Michael Tremer
339ee7e9f6 core121: Ship updated libidn 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-05-05 20:44:52 +01:00
Michael Tremer
27279edffc core121: Ship updated pcre 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-05-05 20:44:20 +01:00
Michael Tremer
e35c70ac23 core121: Ship update list of trusted CAs 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-05-05 20:39:50 +01:00
Arne Fitzenreiter
e990e4273f core121: fix typo fileslist -> filelist 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2018-05-05 18:01:53 +02:00
Michael Tremer
36d9e459c0 core121: Add filelist 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-30 11:26:10 +01:00
Peter Müller
8858180db5 remove forgotten Nagios files, if any 
When we decided to drop Nagios, some files were not removed on the
installations. Since the package does not exist anymore, "pakfire remove
nagios" does not work so we need to clean them up manually in case they
exist.

The third version of this patch makes sure Apache is restarted
afterwards, and includes some forgotten files [sic] as well as it is
now applying for Core Update 121.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-27 11:04:26 +01:00
Peter Müller
2a20456f7d Start Core Update 121 
Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-27 11:04:21 +01:00
Michael Tremer
c79cbc1594 core120: Update OepnVPN configurations for PMTU changes 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-09 11:36:46 +01:00
Michael Tremer
d6d058a56b core120: Update pakfire keystore 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-03 17:34:24 +01:00
Michael Tremer
6ae5439e5c core120: Ship changed pakfire files 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-03 17:33:04 +01:00
Michael Tremer
0471d32b85 core120: Import new pakfire keys 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-02 15:46:40 +01:00
Michael Tremer
74e715a5a2 pakfire: Import old key, too 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-02 15:46:40 +01:00
Michael Tremer
397d3a8e15 pakfire: Rename new key to pakfire-2018.key 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-04-02 15:46:40 +01:00
Michael Tremer
c98304604b core120: Ship updated QoS script and gnupg 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-03-26 19:04:41 +01:00
Michael Tremer
dfdfafc7af core120: Ship updated vnstat 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-03-20 20:36:15 +00:00
Michael Tremer
eb68e27dd2 pakfire: Import key when system boots up 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-03-19 19:44:50 +00:00
Michael Tremer
b2318b5e35 core120: Ship updated logrotate and restart unbound 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-03-18 13:51:38 +00:00