From 42439eba670a76c2fcdd24aa7701f7535545761d Mon Sep 17 00:00:00 2001
From: Jacob Cain <115182890+jrcain-usgs@users.noreply.github.com>
Date: Thu, 28 Mar 2024 08:10:35 -0700
Subject: [PATCH] Updated rclone.conf to point to naif archived kernels (#5442)

* naif source includes /pub/naif, _naifkernels point to archived locations if available

* https for naif

* naif kernel fix description in changelog
---
 CHANGELOG.md            |  1 +
 isis/config/rclone.conf | 42 ++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe739b5541..8057a3ff8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ release.
 - Fixed <i>noproj</i> bug where missing shapemodel-related keywords (RayTraceEngine, BulletParts, Tolerance) are dropped when the output label is created. This resulted in the Bullet collision detection engine not being used. Issue: [#5377](https://github.com/USGS-Astrogeology/ISIS3/issues/5377)
 - Fixed ISIS failing to expand env variables with an "_" in them. [#5402](https://github.com/DOI-USGS/ISIS3/pull/5402)
 - Fixed <i>noproj</i> bug where match cube not NULL when not specifying MATCH parameter [#5381](https://github.com/USGS-Astrogeology/ISIS3/issues/5381)
+- Fixed rclone.conf/downloadIsisData pointing to old naif kernel location, updated to archived locations and https [5394](https://github.com/DOI-USGS/ISIS3/issues/5394)
 
 ## [8.0.2] - 2023-12-05
 ### Changed
diff --git a/isis/config/rclone.conf b/isis/config/rclone.conf
index df0bc9cd7c..d88e5f1467 100644
--- a/isis/config/rclone.conf
+++ b/isis/config/rclone.conf
@@ -10,7 +10,7 @@ url = http://spiftp.esac.esa.int/
 
 [naif]
 type = http
-url = http://naif.jpl.nasa.gov/
+url = https://naif.jpl.nasa.gov/pub/naif/
 
 [jaxa]
 type = http
@@ -62,7 +62,7 @@ upstreams = tgo_usgs: tgo_naifKernels:
 
 [dawn_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/DAWN/kernels/
+upstreams = kernels=naif:DAWN/kernels/
 
 [dawn_usgs]
 type = alias
@@ -82,7 +82,7 @@ upstreams = dawn_kernel_combine: dawn_naifKernels: dawn_usgs:
 
 [cassini_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/CASSINI/kernels/
+upstreams = kernels=naif:CASSINI/kernels/
 
 [cassini_usgs]
 type = alias
@@ -106,7 +106,7 @@ upstreams = hayabusa2_usgs: hayabusa2_naifKernels:
 
 [galileo_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/GLL/kernels/
+upstreams = kernels=naif:GLL/kernels/
 
 [galileo_usgs]
 type = alias 
@@ -118,7 +118,7 @@ upstreams = galileo_usgs: galileo_naifKernels:
 
 [juno_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/JUNO/kernels/
+upstreams = kernels=naif:JUNO/kernels/
 
 [juno_usgs]
 type = alias
@@ -134,7 +134,7 @@ remote = asc_s3:asc-isisdata/usgs_data/lo/
 
 [odyssey_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/M01/kernels/
+upstreams = kernels=naif:M01/kernels/
 
 [odyssey_usgs]
 type = alias
@@ -146,7 +146,7 @@ upstreams = odyssey_usgs: odyssey_naifKernels:
 
 [mro_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/MRO/kernels/
+upstreams = kernels=naif:MRO/kernels/
 
 [mro_usgs]
 type = alias
@@ -158,7 +158,7 @@ upstreams = mro_usgs: mro_naifKernels:
 
 [mex_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/MEX/kernels/
+upstreams = kernels=naif:MEX/kernels/
 
 [mex_usgs]
 type = alias
@@ -194,7 +194,7 @@ upstreams = chandrayaan1_usgs: chandrayaan1_naifKernels:
 
 [clementine1_naifKernels]
 type = combine
-upstreams = naif:/pub/naif/CLEMENTINE/kernels/
+upstreams = naif:pds/data/clem1-l-spice-6-v1.0/clsp_1000/data/
 
 [clementine1_usgs]
 type = alias
@@ -218,7 +218,7 @@ upstreams = kaguya_usgs: kaguya_naifKernels:
 
 [mariner10_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/M10/kernels/
+upstreams = kernels=naif:M10/kernels/
 
 [mariner10_usgs]
 type = alias
@@ -234,7 +234,7 @@ remote = asc_s3:asc-isisdata/usgs_data/mer/
 
 [messenger_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/pds/data/mess-e_v_h-spice-6-v1.0/messsp_1000/data/kernels/
+upstreams = kernels=naif:pds/data/mess-e_v_h-spice-6-v1.0/messsp_1000/data/
 
 [messenger_usgs]
 type = alias
@@ -246,7 +246,7 @@ upstreams = messenger_usgs: messenger_naifKernels:
 
 [mgs_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/pds/data/mgs-m-spice-6-v1.0/mgsp_1000/data/kernels/
+upstreams = kernels=naif:pds/data/mgs-m-spice-6-v1.0/mgsp_1000/data/
 
 [mgs_usgs]
 type = alias
@@ -258,7 +258,7 @@ upstreams = mgs_usgs: mgs_naifKernels:
 
 [near_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/pds/data/near-a-spice-6-v1.0/nearsp_1000/data/
+upstreams = kernels=naif:pds/data/near-a-spice-6-v1.0/nearsp_1000/data/
 
 [near_usgs]
 type = alias
@@ -270,7 +270,7 @@ upstreams = near_usgs: near_naifKernels:
 
 [newhorizons_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/NEWHORIZONS/kernels/
+upstreams = kernels=naif:pds/data/nh-j_p_ss-spice-6-v1.0/nhsp_1000/data/
 
 [newhorizons_usgs]
 type = alias
@@ -282,7 +282,7 @@ upstreams = newhorizons_usgs: newhorizons_naifKernels:
 
 [osirisrex_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/pds/pds4/orex/orex_spice/spice_kernels/ 
+upstreams = kernels=naif:pds/pds4/orex/orex_spice/spice_kernels/ 
 
 [osirisrex_usgs]
 type = alias
@@ -298,7 +298,7 @@ remote = asc_s3:asc-isisdata/usgs_data/rolo/
 
 [rosetta_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/ROSETTA/kernels/
+upstreams = kernels=naif:ROSETTA/kernels/
 
 [rosetta_usgs]
 type = alias
@@ -322,7 +322,7 @@ upstreams = smart1_usgs: smart1_naifKernels:
 
 [viking1_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/VIKING/kernels/
+upstreams = kernels=naif:pds/data/vo1_vo2-m-spice-6-v1.0/vosp_1000/data/
 
 [viking1_usgs]
 type = alias
@@ -334,7 +334,7 @@ upstreams = viking1_usgs: viking1_naifKernels:
 
 [viking2_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/VIKING/kernels/
+upstreams = kernels=naif:pds/data/vo1_vo2-m-spice-6-v1.0/vosp_1000/data/
 
 [viking2_usgs]
 type = alias
@@ -346,7 +346,7 @@ upstreams = viking2_usgs: viking2_naifKernels:
 
 [voyager1_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/VOYAGER/kernels/
+upstreams = kernels=naif:VOYAGER/kernels/
 
 [voyager1_usgs]
 type = alias
@@ -358,7 +358,7 @@ upstreams = voyager1_usgs: voyager1_naifKernels:
 
 [voyager2_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/VOYAGER/kernels/
+upstreams = kernels=naif:VOYAGER/kernels/
 
 [voyager2_usgs]
 type = alias
@@ -374,7 +374,7 @@ remote = asc_s3:asc-isisdata/usgs_data/msl/
 
 [msl_naifKernels]
 type = combine
-upstreams = kernels=naif:/pub/naif/MSL/kernels/
+upstreams = kernels=naif:MSL/kernels/
 
 [msl]
 type = union