Update kickstart script to use new DEB infrastructure. (#14301)
* Update kickstart script to use new DEB infrastructure. * Fix package filename suffix handling for DEB packages. * Fix the DEB package availability check to use new repo URL.
Austin S. Hemmelgarn committed
Jan 23, 2023 at 07:22 UTC
5fabd2548ca342e9133add357bf160c67c6de079
1 file changed
+6
-6
packaging/installer/kickstart.sh
+6
-6
@@ -28,8 +28,8 @@ KICKSTART_SOURCE="$(
28
PACKAGES_SCRIPT="https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/install-required-packages.sh"
29
PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
30
PUBLIC_CLOUD_URL="https://app.netdata.cloud"
31
-REPOCONFIG_DEB_URL_PREFIX="https://packagecloud.io/netdata/netdata-repoconfig/packages"
32
-REPOCONFIG_DEB_VERSION="1-2"
31
+REPOCONFIG_DEB_URL_PREFIX="https://repo.netdata.cloud/repos/repoconfig"
32
+REPOCONFIG_DEB_VERSION="2-1"
33
REPOCONFIG_RPM_URL_PREFIX="https://repo.netdata.cloud/repos/repoconfig"
34
REPOCONFIG_RPM_VERSION="2-1"
35
START_TIME="$(date +%s)"
@@ -1283,7 +1283,7 @@ pkg_installed() {
1283
netdata_avail_check() {
1284
case "${DISTRO_COMPAT_NAME}" in
1285
debian|ubuntu)
1286
- env DEBIAN_FRONTEND=noninteractive apt-cache policy netdata | grep -q packagecloud.io/netdata/netdata;
1286
+ env DEBIAN_FRONTEND=noninteractive apt-cache policy netdata | grep -q repo.netdata.cloud/repos/;
1287
return $?
1288
;;
1289
centos|fedora|ol)
@@ -1362,7 +1362,7 @@ try_package_install() {
1362
repo_subcmd="update"
1363
repo_prefix="debian/${SYSCODENAME}"
1364
pkg_type="deb"
1365
- pkg_suffix="_all"
1365
+ pkg_suffix="+debian${SYSVERSION}_all"
1366
pkg_vsep="_"
1367
pkg_install_opts="${interactive_opts}"
1368
repo_update_opts="${interactive_opts}"
@@ -1376,7 +1376,7 @@ try_package_install() {
1376
repo_subcmd="update"
1377
repo_prefix="ubuntu/${SYSCODENAME}"
1378
pkg_type="deb"
1379
- pkg_suffix="_all"
1379
+ pkg_suffix="+ubuntu${SYSVERSION}_all"
1380
pkg_vsep="_"
1381
pkg_install_opts="${interactive_opts}"
1382
repo_update_opts="${interactive_opts}"
@@ -1473,7 +1473,7 @@ try_package_install() {
1473
case "${pkg_type}" in
1474
deb)
1475
repoconfig_file="${repoconfig_name}${pkg_vsep}${REPOCONFIG_DEB_VERSION}${pkg_suffix}.${pkg_type}"
1476
- repoconfig_url="${REPOCONFIG_DEB_URL_PREFIX}/${repo_prefix}/${repoconfig_file}/download.${pkg_type}"
1476
+ repoconfig_url="${REPOCONFIG_DEB_URL_PREFIX}/${repo_prefix}/${repoconfig_file}"
1477
;;
1478
rpm)
1479
repoconfig_file="${repoconfig_name}${pkg_vsep}${REPOCONFIG_RPM_VERSION}${pkg_suffix}.${pkg_type}"