From 4a1e1a7c236f069c59c5c8d5011823485617ce24 Mon Sep 17 00:00:00 2001
From: _ <>
Date: Mon, 2 Nov 2020 19:17:22 +0000
Subject: [PATCH] :bug: Fixes for actual use

---
 .gitignore                             | 3 ++-
 ptth_handlebars/file_server_dir.html   | 2 +-
 ptth_handlebars/relay_server_list.html | 2 +-
 src/bin/ptth_server.rs                 | 2 +-
 src/lib.rs                             | 2 +-
 src/server/mod.rs                      | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index b51e2f7..690f90c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /Cargo.lock
-/old-git.tar.gz
+/config
+/*.tar.gz
 /ptth_server.toml
 /ptth_relay.toml
 /target
diff --git a/ptth_handlebars/file_server_dir.html b/ptth_handlebars/file_server_dir.html
index 831d079..675d58f 100644
--- a/ptth_handlebars/file_server_dir.html
+++ b/ptth_handlebars/file_server_dir.html
@@ -4,7 +4,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <style>
 	body {
-		font-family: sans;
+		font-family: sans-serif;
 	}
 	.entry {
 		display: inline-block;
diff --git a/ptth_handlebars/relay_server_list.html b/ptth_handlebars/relay_server_list.html
index ca4fac0..2c9b6a9 100644
--- a/ptth_handlebars/relay_server_list.html
+++ b/ptth_handlebars/relay_server_list.html
@@ -4,7 +4,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <style>
 	body {
-		font-family: sans;
+		font-family: sans-serif;
 	}
 	.entry {
 		display: inline-block;
diff --git a/src/bin/ptth_server.rs b/src/bin/ptth_server.rs
index c5cec75..3d972c1 100644
--- a/src/bin/ptth_server.rs
+++ b/src/bin/ptth_server.rs
@@ -16,7 +16,7 @@ async fn main () -> Result <(), Box <dyn Error>> {
 	use std::io::Read;
 	
 	let config_file = {
-		let config_file_path = "ptth_server.toml";
+		let config_file_path = "config/ptth_server.toml";
 		
 		let mut f = std::fs::File::open (config_file_path).expect (&format! ("Can't open {:?}", config_file_path));
 		let mut buffer = vec! [0u8; 4096];
diff --git a/src/lib.rs b/src/lib.rs
index 2e1c271..7d53291 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -110,7 +110,7 @@ mod tests {
 			let config_file = server::ConfigFile {
 				name: server_name.into (),
 				api_key: api_key.into (),
-				relay_url: relay_url.into (),
+				relay_url: "http://127.0.0.1:4000/7ZSFUKGV".into (),
 				file_server_root: None,
 			};
 			spawn (async move {
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 1eaaadc..dfba1df 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -80,7 +80,7 @@ async fn handle_req_resp <'a> (
 			};
 			
 			let mut resp_req = state.client
-			.post (&format! ("{}/7ZSFUKGV/http_response/{}", state.config.relay_url, req_id))
+			.post (&format! ("{}/http_response/{}", state.config.relay_url, req_id))
 			.header (crate::PTTH_MAGIC_HEADER, base64::encode (rmp_serde::to_vec (&response.parts).unwrap ()));
 			
 			if let Some (body) = response.body {
@@ -152,7 +152,7 @@ pub async fn main (config_file: ConfigFile, opt: Opt)
 			delay_for (Duration::from_millis (backoff_delay)).await;
 		}
 		
-		let req_req = state.client.get (&format! ("{}/7ZSFUKGV/http_listen/{}", state.config.relay_url, config_file.name));
+		let req_req = state.client.get (&format! ("{}/http_listen/{}", state.config.relay_url, config_file.name));
 		
 		let err_backoff_delay = std::cmp::min (30_000, backoff_delay * 2 + 500);