From 218bae3b465474a0387a848326fbc000cc67eb3e Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 26 Feb 2021 11:12:23 -0700
Subject: [PATCH] appmgr: fix CA paths

---
 appmgr/src/tor.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/appmgr/src/tor.rs b/appmgr/src/tor.rs
index 493280733..05c64e737 100644
--- a/appmgr/src/tor.rs
+++ b/appmgr/src/tor.rs
@@ -314,15 +314,26 @@ pub async fn write_lan_services(hidden_services: &ServicesMap) -> Result<(), Err
                             &mut tokio::fs::File::open(
                                 "/root/agent/ca/intermediate/certs/embassy-int-ca.crt.pem",
                             )
-                            .await?,
+                            .await
+                            .with_context(|e| {
+                                format!(
+                                    "{}: /root/agent/ca/intermediate/certs/embassy-int-ca.crt.pem",
+                                    e
+                                )
+                            })
+                            .with_code(crate::error::FILESYSTEM_ERROR)?,
                             &mut *fullchain_file,
                         )
                         .await?;
                         tokio::io::copy(
                             &mut tokio::fs::File::open(
-                                "/root/agent/ca/certs/embassy-int-ca.crt.pem",
+                                "/root/agent/ca/certs/embassy-root-ca.cert.pem",
                             )
-                            .await?,
+                            .await
+                            .with_context(|e| {
+                                format!("{}: /root/agent/ca/certs/embassy-root-ca.cert.pem", e)
+                            })
+                            .with_code(crate::error::FILESYSTEM_ERROR)?,
                             &mut *fullchain_file,
                         )
                         .await?;