Add HTTPS URIs to TALs, update ARIN download URI

diff --git a/examples/tal/afrinic.tal b/examples/tal/afrinic.tal
index fc7639f38f433b416f1e83138ec193142cc6c0b0..e61c4829cb28e87d854b3fef36e398ceb49ddf36 100644 (file)
--- a/examples/tal/afrinic.tal
+++ b/examples/tal/afrinic.tal
@@ -1,3 +1,4 @@
+https://rpki.afrinic.net/repository/AfriNIC.cer
 rsync://rpki.afrinic.net/repository/AfriNIC.cer
 
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxsAqAhWIO+ON2Ef9oRDM

diff --git a/examples/tal/apnic.tal b/examples/tal/apnic.tal
index fc781ee224092a954107127f9391ca94550b388f..57cd9125db0cd5a035bfe992eb55682727a71d67 100644 (file)
--- a/examples/tal/apnic.tal
+++ b/examples/tal/apnic.tal
@@ -1,3 +1,4 @@
+https://tal.apnic.net/apnic.cer
 rsync://rpki.apnic.net/repository/apnic-rpki-root-iana-origin.cer
 
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9RWSL61YAAYumEiU8z8

diff --git a/examples/tal/ripe.tal b/examples/tal/ripe.tal
index acdb17313079dcdd9363d197e7f9ce8fb209ceef..80002d9768942f428ce0dae867df989e478551e3 100644 (file)
--- a/examples/tal/ripe.tal
+++ b/examples/tal/ripe.tal
@@ -1,3 +1,4 @@
+https://rpki.ripe.net/ta/ripe-ncc-ta.cer
 rsync://rpki.ripe.net/ta/ripe-ncc-ta.cer
 
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0URYSGqUz2myBsOzeW1j

diff --git a/fort_setup.sh b/fort_setup.sh
index 23e3f70f58547b3ab85fcc7d8c33df728f06e0a9..2b4453a176423e073db257da4fa547042dbef5dd 100755 (executable)
--- a/fort_setup.sh
+++ b/fort_setup.sh
@@ -92,7 +92,7 @@ GITHUB_TALS="https://raw.githubusercontent.com/NICMx/FORT-validator/master/examp
 ACCEPT="no"
 REPO_DIR="/var/cache/fort/repository"
 CONF_FILE="${CONF_DIR}/fort-config.json"
-ARIN_TAL="https://www.arin.net/resources/manage/rpki/arin-rfc7730.tal"
+ARIN_TAL="https://www.arin.net/resources/manage/rpki/arin.tal"
 
 # Agree ARIN RPA. Exit on denial or unknown response, download otherwise.
 echo "Please download and read ARIN Relying Party Agreement (RPA) from https://www.arin.net/resources/manage/rpki/rpa.pdf"