From 0e39b3dc80e8218fb98deb33675a4f1d2ce80bfb Mon Sep 17 00:00:00 2001
From: int 80h <int@80h.dev>
Date: Tue, 23 Nov 2021 12:40:52 -0500
Subject: [PATCH] Refactoring

---
 README                  | 22 +++++++---------------
 src/{ => lib}/conn.rs   |  0
 src/lib/mod.rs          |  4 ++++
 src/{ => lib}/status.rs |  0
 src/{ => lib}/tls.rs    |  0
 src/{ => lib}/util.rs   |  0
 src/main.rs             | 12 +++++++-----
 7 files changed, 18 insertions(+), 20 deletions(-)
 rename src/{ => lib}/conn.rs (100%)
 create mode 100644 src/lib/mod.rs
 rename src/{ => lib}/status.rs (100%)
 rename src/{ => lib}/tls.rs (100%)
 rename src/{ => lib}/util.rs (100%)

diff --git a/README b/README
index 7cdf927..fd52331 100644
--- a/README
+++ b/README
@@ -13,7 +13,13 @@ A gemini server written in rust.
 
 ## Installation and running
 
-OpenSSL 1.1.0g or LibreSSL 2.7.0 or newer is required.
+It's recommended that you build with Libressl instead of Openssl
+
+## Install from crates.io:
+
+cargo install gemserv
+
+## Build from source:
 
  - Clone the repo
  - If you want to use all features run 'cargo build --release' or if you only
@@ -26,20 +32,6 @@ OpenSSL 1.1.0g or LibreSSL 2.7.0 or newer is required.
 In the init-scripts directory there's OpenRC(Courtesy of Tastytea) and systemd
 service files.
 
-### NetBSD
-If running on NetBSD you'll need to set the environmental variable OPENSSL_DIR
-before compiling.
-
-'export OPENSSL_DIR="/usr/pkg"'
-
-Also to run you'll need to symlink libssl, and libcrypt to "/usr/lib" by
-running:
-
-'ln -s /usr/pkg/lib/libssl.so.1.1 /usr/lib'
-'ln -s /usr/pkg/lib/libcrypt.so.1.1 /usr/lib'
-
-Thanks to tiwesdaeg for figuring it out.
-
 ## CGI and SCGI
 
 There's example SCGI scripts for python and perl in the cgi-scripts directory.
diff --git a/src/conn.rs b/src/lib/conn.rs
similarity index 100%
rename from src/conn.rs
rename to src/lib/conn.rs
diff --git a/src/lib/mod.rs b/src/lib/mod.rs
new file mode 100644
index 0000000..0cef841
--- /dev/null
+++ b/src/lib/mod.rs
@@ -0,0 +1,4 @@
+pub mod util;
+pub mod status;
+pub mod conn;
+pub mod tls;
diff --git a/src/status.rs b/src/lib/status.rs
similarity index 100%
rename from src/status.rs
rename to src/lib/status.rs
diff --git a/src/tls.rs b/src/lib/tls.rs
similarity index 100%
rename from src/tls.rs
rename to src/lib/tls.rs
diff --git a/src/util.rs b/src/lib/util.rs
similarity index 100%
rename from src/util.rs
rename to src/lib/util.rs
diff --git a/src/main.rs b/src/main.rs
index 4680ed1..97457f1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,15 +17,17 @@ use tokio::io::AsyncReadExt;
 use tokio::runtime;
 use url::Url;
 
+mod lib;
 mod cgi;
 mod config;
-mod status;
-use status::Status;
-mod conn;
 mod logger;
 mod revproxy;
-mod tls;
-mod util;
+
+use lib::util;
+use lib::conn;
+use lib::status;
+use status::Status;
+use lib::tls;
 
 fn get_mime(path: &PathBuf) -> String {
     let mut mime = "text/gemini".to_string();