Re-added EPEL on CentOS 7. (#11525)
* Re-added EPEL on CentOS 7. We actually do need it there. * Fix handling of default dependency sets. * Fix CentOS 7 version matching.
Austin S. Hemmelgarn committed
Sep 20, 2021 at 03:35 UTC
f8b24310b744a6632cf3dde7b3e7a8c1830e1250
1 file changed
+10
-3
packaging/installer/install-required-packages.sh
+10
-3
@@ -20,7 +20,7 @@ fi
20
PACKAGES_NETDATA=${PACKAGES_NETDATA-1}
21
PACKAGES_NETDATA_NODEJS=${PACKAGES_NETDATA_NODEJS-0}
22
PACKAGES_NETDATA_PYTHON=${PACKAGES_NETDATA_PYTHON-0}
23
-PACKAGES_NETDATA_PYTHON3=${PACKAGES_NETDATA_PYTHON3-0}
23
+PACKAGES_NETDATA_PYTHON3=${PACKAGES_NETDATA_PYTHON3-1}
24
PACKAGES_NETDATA_PYTHON_MYSQL=${PACKAGES_NETDATA_PYTHON_MYSQL-0}
25
PACKAGES_NETDATA_PYTHON_POSTGRES=${PACKAGES_NETDATA_PYTHON_POSTGRES-0}
26
PACKAGES_NETDATA_PYTHON_MONGO=${PACKAGES_NETDATA_PYTHON_MONGO-0}
@@ -31,8 +31,8 @@ PACKAGES_FIREQOS=${PACKAGES_FIREQOS-0}
31
PACKAGES_UPDATE_IPSETS=${PACKAGES_UPDATE_IPSETS-0}
32
PACKAGES_NETDATA_DEMO_SITE=${PACKAGES_NETDATA_DEMO_SITE-0}
33
PACKAGES_NETDATA_SENSORS=${PACKAGES_NETDATA_SENSORS-0}
34
-PACKAGES_NETDATA_DATABASE=${PACKAGES_NETDATA_DATABASE-0}
35
-PACKAGES_NETDATA_EBPF=${PACKAGES_NETDATA_EBPF-0}
34
+PACKAGES_NETDATA_DATABASE=${PACKAGES_NETDATA_DATABASE-1}
35
+PACKAGES_NETDATA_EBPF=${PACKAGES_NETDATA_EBPF-1}
36
37
# needed commands
38
lsb_release=$(command -v lsb_release 2> /dev/null)
@@ -1573,6 +1573,13 @@ validate_tree_centos() {
1573
echo >&2 " > Installing Judy-devel directly ..."
1574
run ${sudo} yum ${opts} install http://mirror.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm
1575
1576
+ elif [[ "${version}" =~ ^7(\..*)?$ ]]; then
1577
+ echo >&2 " > Checking for EPEL ..."
1578
+ if ! rpm -qa | grep epel-release > /dev/null; then
1579
+ if prompt "EPEL not found, shall I install it?"; then
1580
+ run ${sudo} yum ${opts} install epel-release
1581
+ fi
1582
+ fi
1583
elif [[ "${version}" =~ ^6\..*$ ]]; then
1584
echo >&2 " > Detected CentOS 6.x ..."
1585
echo >&2 " > Checking for Okay ..."