Commit Graph

14203 Commits

Author SHA1 Message Date
Arne Fitzenreiter
ccf83df93c Merge branch 'core141' 2020-01-30 12:20:46 +00:00
Arne Fitzenreiter
e8adbea97b general-functions.pl: Return unique list of nameservers
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-30 13:13:46 +01:00
Arne Fitzenreiter
99cadb743a ids-functions.pl: Fall back to $EXTERNAL_NET for DNS servers
When no DNS servers are configured (aka recursor mode), the
DNS servers that unbound will try to contact can be anywhere.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-30 13:07:01 +01:00
Arne Fitzenreiter
b76118c32c ids-functions.pl: Fix generating DNS_SERVERS
The configuration file has an invalid syntax which causes
suricata to fail to start.

There was no comma inserted between DNS servers when there
was more than two of them. This is now fixed in this patch..

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-30 12:51:31 +01:00
Arne Fitzenreiter
83165259b1 core141: run pakfire update after db cleanup
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-29 12:54:00 +00:00
Michael Tremer
e2338aa7ef make.sh: Modify update-contributors so that it will run with older version of awk
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-01-29 11:59:21 +01:00
Michael Tremer
8729316513 convert-dns-settings: Explicitely enable using ISP name servers
The unbound initscript checks if this parameter is on.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-01-29 11:52:02 +01:00
Michael Tremer
38f51465c9 dns.cgi: Shorten time when checking if DNS is alive
For localhost, one second should be plenty

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-01-29 11:47:35 +01:00
Michael Tremer
351ad526b2 dns.cgi: Show recursor mode message even when we have some servers to show
The message was not shown when we have received DNS servers from the
provider.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-01-29 11:40:59 +01:00
Arne Fitzenreiter
15e3419434 convert-dns-settings: remove DNS settings also if no server config is generated
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-28 20:31:22 +00:00
Arne Fitzenreiter
3ee6ac9dad convert-dns-settings: Remove DNS variable from PPP profiles
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-28 19:38:16 +00:00
Arne Fitzenreiter
5d6ccc7a43 convert-dns-settings: Refactor reading old configuration
This patch makes the code a lot shorter by removing special
cases for all sorts of files when they can all be treaded
equally.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-28 19:34:56 +00:00
Arne Fitzenreiter
d3236de23a convert-dns-settings: Fix call for chmod
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-28 19:19:06 +00:00
Stefan Schantl
358bcfdb29 convert-dns-settings: Fix check to prevent doubble-adding the same server
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-28 15:38:36 +00:00
Arne Fitzenreiter
932cee06f1 core141: manually delete pakfire lists
pakfire update --force
fail sometimes fail and use the old version of the serverlist
and get the old addon list. With removed list it cannot
use the wrong addonlist after update to IPFire 2.25.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-27 17:56:51 +00:00
Arne Fitzenreiter
3195d17490 core141: use full path to pakfire
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-27 16:22:17 +00:00
Arne Fitzenreiter
681911df42 core141: fix remove of go8.3.0 directory
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-27 16:20:57 +00:00
Arne Fitzenreiter
315f67ec89 core141: remove elinks and python3 from pakfire db
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-26 13:22:47 +00:00
Arne Fitzenreiter
23e3e71025 core141: force packet list update after version change
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-26 13:14:43 +00:00
Arne Fitzenreiter
c845152b6d set version and pakfire version to core141
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-26 13:10:13 +01:00
Arne Fitzenreiter
6df8a22b8a core141: correct move of nobeeps flag
in core139 there was a syntax error, and it was missed in
backup converter also.

fixes #12273

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-26 13:07:08 +01:00
Arne Fitzenreiter
a83bcf914c networking/red: wait only for carrier if device exists
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-25 22:22:26 +01:00
Arne Fitzenreiter
4f175a1f57 rust: rootfiles updates
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-25 21:14:54 +01:00
Arne Fitzenreiter
8961fd0852 core141: run convert-dns-settings at update
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-25 19:44:18 +00:00
Arne Fitzenreiter
87dfe754a2 core141: check free space on root
also force fsck at next boot to free the journal on xfs partitions.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-25 15:28:06 +00:00
Arne Fitzenreiter
efc4a15600 core140: don't system-release and co
This files contain version 141 because there is no extra build
so don't pak it into the updater to prevent wrong display in webgui
if core141 fails because there is not enough diskspace.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-25 15:16:12 +00:00
Arne Fitzenreiter
ac924baf92 core141: cleanup go-8.3.0 and run filesystem-cleanup
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-25 15:13:51 +00:00
Arne Fitzenreiter
8c0ab3d471 filesystem-cleanup: fix "fixed space" type
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-25 15:05:38 +00:00
Stefan Schantl
612bb2dff9 ids-functions.pl: Introduce file for local rules.
This file is to be used, to store customized IDS rules.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-25 15:04:39 +00:00
Arne Fitzenreiter
140707831b core140: remove /usr/lib/libboost*1.55.0 at cleanup
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-24 19:20:36 +01:00
Arne Fitzenreiter
45e1202d27 filesystem-cleanup: add /usr/lib/sse2 folder
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-24 19:18:15 +01:00
Arne Fitzenreiter
69c529972a core140: insert a core upgrade that only cleans the rootfs
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-24 19:14:02 +01:00
Arne Fitzenreiter
d3bf851bf8 rename core140 to core141
we need to insert a core that cleanup root to free some diskspace.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-24 08:55:40 +01:00
Arne Fitzenreiter
30fcfc4cd5 core140: ship glibc built with new gcc
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-23 17:53:23 +00:00
Arne Fitzenreiter
fa886f2561 core140: add gui.cgi
this cgi was forgotten in core139

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-23 17:47:42 +00:00
Stefan Schantl
4a791d2ab9 dns.cgi: Display when unbound is running in recursor mode.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-21 19:33:43 +00:00
Stefan Schantl
ab4ef40f2b unbound: Use recursor mode if no nameservers are configured
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-21 19:32:34 +00:00
Michael Tremer
26eab1fe3e azure: Abort script when no instance ID can be retrieved
We cannot reliably determine if a system is running on Hyper-V
on a private server or on the Azure Cloud.

Therefore, we will have to try to retrieve an IP address
with DHCP and try to connect to the metadata service. If either
of those things is not successful, we will just continue with
the setup process as usual.

So cloud instances should be automatically configured now and
all other systems will continue to boot and call the setup
wizard as usual.

Fixes: #12272
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-21 19:32:07 +00:00
Arne Fitzenreiter
b3e3c81895 core140: add changed cloudsetup helper tu updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-19 17:28:24 +00:00
Michael Tremer
f770492902 cloud-init: Remove importing DNS settings
Those scripts used to import settings from the meta-data services
and wrote them to the local configuration files.

For the DNS settings and Amazon, this is no longer possible because
their DNS servers do not support DNSSEC at all. Therefore we default
to recursor mode.

To be consistent across cloud providers, we are doing the same for
Azure.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-19 16:37:03 +00:00
Michael Tremer
c07c3e47f1 modules: Cleanup file
This file has an unsed line for the "fusion" module which
is no longer needed.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-19 16:36:59 +00:00
Michael Tremer
a8d1621299 modules: No longer load parallel port modules
These modules are loaded by default on all systems.

They are simply a waste of space since not many systems
have parallel ports any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-19 16:36:54 +00:00
Michael Tremer
e403fa6ad9 setup: Do not check DNS settings any more
It has been removed that DNS servers could be configured in
setup, but I forgot to remove a check which leads to new
installations not being able to complete the setup wizard.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-19 15:34:45 +00:00
Stefan Schantl
dcc655efb8 convert-dns-settings: Import all possible PPP dialin profiles.
* Avoid from adding the same imported DNS server multiple times.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-19 12:24:23 +00:00
Arne Fitzenreiter
dc08d74d95 core140: fix typo
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-19 12:23:54 +00:00
Arne Fitzenreiter
97f4b51474 partresize: NanoPi R1: copy also a0 config of Ampac AP6212
there is a second hardware version of the AP6212 in some NanoPi R1
boards.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-17 11:26:10 +01:00
Arne Fitzenreiter
7fd560d81f core140: add lvm2 to core updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-16 18:28:26 +00:00
Michael Tremer
8893881160 lvm2: Add initscript for lvmetad
This daemon needs to be launched in order to use LVM
devices in IPFire.

It will run on all installations after this patch has been
merged but only consumes very little memory.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-16 18:23:30 +00:00
Michael Tremer
dd5e20120e lvm2: Create lock files in /run/lvm
The default is /var/lock which is not mounted at the time
when udev is initialising the volumes. Therefore after a
reboot, LVM devices won't show up unless pvscan is executed
manually.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-16 18:23:11 +00:00
Michael Tremer
c835011d6e lvm2: Enable lvmetad
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-16 18:22:51 +00:00