From 3dfecb88c4f13135eb54748818cb60766ca11de0 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Fri, 24 Sep 2021 15:19:22 -0600
Subject: [PATCH] write nginx conf in diagnostic mode

---
 appmgr/src/bin/embassy-init.rs |  2 +-
 appmgr/src/bin/embassyd.rs     | 19 ++++++++++++++
 compat/Cargo.lock              | 47 ----------------------------------
 3 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/appmgr/src/bin/embassy-init.rs b/appmgr/src/bin/embassy-init.rs
index 80e1c0d22..156bd97f9 100644
--- a/appmgr/src/bin/embassy-init.rs
+++ b/appmgr/src/bin/embassy-init.rs
@@ -170,7 +170,7 @@ async fn inner_main(cfg_path: Option<&str>) -> Result<(), Error> {
             log::debug!("{}", e.source);
             embassy::sound::BEETHOVEN.play().await?;
             #[cfg(feature = "avahi")]
-            let mdns = MdnsController::init();
+            let _mdns = MdnsController::init();
             tokio::fs::write(
                 "/etc/nginx/sites-available/default",
                 include_str!("../nginx/diagnostic-ui.conf"),
diff --git a/appmgr/src/bin/embassyd.rs b/appmgr/src/bin/embassyd.rs
index 57ab8b1f4..174cf7eaa 100644
--- a/appmgr/src/bin/embassyd.rs
+++ b/appmgr/src/bin/embassyd.rs
@@ -6,6 +6,7 @@ use embassy::db::subscribe;
 use embassy::middleware::auth::auth;
 use embassy::middleware::cors::cors;
 use embassy::middleware::diagnostic::diagnostic;
+use embassy::net::mdns::MdnsController;
 use embassy::net::tor::tor_health_check;
 use embassy::shutdown::Shutdown;
 use embassy::status::{check_all, synchronize_all};
@@ -275,6 +276,24 @@ fn main() {
                         log::error!("{}", e.source);
                         log::debug!("{}", e.source);
                         embassy::sound::BEETHOVEN.play().await?;
+                        #[cfg(feature = "avahi")]
+                        let _mdns = MdnsController::init();
+                        tokio::fs::write(
+                            "/etc/nginx/sites-available/default",
+                            include_str!("../nginx/diagnostic-ui.conf"),
+                        )
+                        .await
+                        .with_ctx(|_| {
+                            (
+                                embassy::ErrorKind::Filesystem,
+                                "/etc/nginx/sites-available/default",
+                            )
+                        })?;
+                        Command::new("systemctl")
+                            .arg("reload")
+                            .arg("nginx")
+                            .invoke(embassy::ErrorKind::Nginx)
+                            .await?;
                         let ctx = DiagnosticContext::init(cfg_path, e).await?;
                         rpc_server!({
                             command: embassy::diagnostic_api,
diff --git a/compat/Cargo.lock b/compat/Cargo.lock
index 9ec7b8b4a..d7587e042 100644
--- a/compat/Cargo.lock
+++ b/compat/Cargo.lock
@@ -548,20 +548,6 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
 
-[[package]]
-name = "crossbeam"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
-dependencies = [
- "cfg-if",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.1"
@@ -572,30 +558,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
-dependencies = [
- "cfg-if",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
-]
-
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.2"
@@ -1996,7 +1958,6 @@ dependencies = [
  "log",
  "nix 0.20.1",
  "patch-db-macro",
- "qutex-2",
  "serde",
  "serde_cbor 0.11.1",
  "serde_json",
@@ -2298,14 +2259,6 @@ dependencies = [
  "proc-macro2 1.0.29",
 ]
 
-[[package]]
-name = "qutex-2"
-version = "0.3.0"
-dependencies = [
- "crossbeam",
- "futures",
-]
-
 [[package]]
 name = "radium"
 version = "0.5.3"