Remove ARIN TAL. You are welcome!

NLnetLabs · Sep 25, 2018 · b1e7074 · b1e7074
1 parent 397f26a
commit b1e7074
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 /target/
 **/*.rs.bk
 /rpki-cache/repository
+/rpki-cache/tal/arin.tal
 /.cargo
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rpki-cache/tal/arin.tal b/rpki-cache/tal/arin.tal
@@ -1,7 +1,10 @@
-rsync://rpki.arin.net/repository/arin-rpki-ta.cer
+# https://www.arin.net/resources/rpki/tal.html
 
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3lZPjbHvMRV5sDDqfLc/685th5FnreHMJjg8
-pEZUbG8Y8TQxSBsDebbsDpl3Ov3Cj1WtdrJ3CIfQODCPrrJdOBSrMATeUbPC+JlNf2SRP3UB+VJFgtTj
-0RN8cEYIuhBW5t6AxQbHhdNQH+A1F/OJdw0q9da2U29Lx85nfFxvnC1EpK9CbLJS4m37+RlpNbT1cba+
-b+loXpx0Qcb1C4UpJCGDy7uNf5w6/+l7RpATAHqqsX4qCtwwDYlbHzp2xk9owF3mkCxzl0HwncO+sEHH
-eaL3OjtwdIGrRGeHi2Mpt+mvWHhtQqVG+51MHTyg+nIjWFKKGx1Q9+KDx4wJStwveQIDAQAB
+This file isn’t ARIN’s TAL but rather a placeholder. Until you replace
+it with the actual TAL you can find at the above URL, Routinator will
+not run.
+
+Please download the TAL in RFC 7730 format and copy the it here.
+
+Apologies for the inconvenience. Be assured that this procedure isn’t
+our choice.
diff --git a/src/repository.rs b/src/repository.rs
@@ -263,7 +263,7 @@ impl Repository {
                 return Err(err.into())
             }
         };
-        let tal = match Tal::read(&mut file) {
+        let tal = match Tal::read(&path, &mut file) {
             Ok(tal) => tal,
             Err(err) => {
                 error!("{}: {}. Aborting.", path.display(), err);