From 25c55ea426c85867c521201015334c9e3cf54b7b Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 18 Jan 2021 22:13:18 -0700
Subject: [PATCH] appmgr: sync after deleting hostname

---
 appmgr/Cargo.lock | 15 ++++++++++++++-
 appmgr/Cargo.toml |  1 +
 appmgr/src/tor.rs |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/appmgr/Cargo.lock b/appmgr/Cargo.lock
index b86f37870..96c5a3190 100644
--- a/appmgr/Cargo.lock
+++ b/appmgr/Cargo.lock
@@ -51,6 +51,7 @@ dependencies = [
  "lazy_static",
  "linear-map",
  "log",
+ "nix 0.19.1",
  "openssl",
  "pest",
  "pest_derive",
@@ -601,7 +602,7 @@ dependencies = [
  "gcc",
  "libc",
  "mktemp",
- "nix",
+ "nix 0.11.1",
 ]
 
 [[package]]
@@ -1310,6 +1311,18 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "nix"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
 [[package]]
 name = "nom"
 version = "4.2.3"
diff --git a/appmgr/Cargo.toml b/appmgr/Cargo.toml
index e87618902..b5a1af76c 100644
--- a/appmgr/Cargo.toml
+++ b/appmgr/Cargo.toml
@@ -32,6 +32,7 @@ itertools = "0.9.0"
 lazy_static = "1.4"
 linear-map = { version = "1.2", features = ["serde_impl"] }
 log = "0.4.11"
+nix = "0.19.1"
 openssl = "0.10.30"
 pest = "2.1"
 pest_derive = "2.1"
diff --git a/appmgr/src/tor.rs b/appmgr/src/tor.rs
index ff650f291..8db0dd37d 100644
--- a/appmgr/src/tor.rs
+++ b/appmgr/src/tor.rs
@@ -217,7 +217,7 @@ pub async fn read_tor_key(
     version: HiddenServiceVersion,
     timeout: Option<Duration>,
 ) -> Result<String, Error> {
-    log::info!("Retrieving Tor hidden service address for {}.", name);
+    log::info!("Retrieving Tor hidden service key for {}.", name);
     let addr_path = Path::new(HIDDEN_SERVICE_DIR_ROOT)
         .join(format!("app-{}", name))
         .join(match version {
@@ -287,6 +287,7 @@ pub async fn set_svc(
             Err(e)
         }
     })?;
+    nix::unistd::sync();
     hidden_services.commit().await?;
     log::info!("Reloading Tor.");
     let svc_exit = std::process::Command::new("service")