From 8551bf2e34d9543fa41a83fae785ed81d6a6c10f Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sun, 6 Aug 2023 12:52:42 +0200
Subject: move shared server code to own crate

---
 server/src/main.rs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'server/src/main.rs')

diff --git a/server/src/main.rs b/server/src/main.rs
index b10831f..73d90a4 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -8,29 +8,15 @@
 use crate::routes::ui::admin::log::enable_logging;
 use database::Database;
 use federation::Federation;
-use jellycommon::config::GlobalConfig;
+use jellybase::CONF;
 use jellyremuxer::RemuxerContext;
-use once_cell::sync::Lazy;
 use routes::build_rocket;
-use std::fs::File;
 
 pub mod database;
 pub mod federation;
 pub mod import;
 pub mod routes;
 
-pub static CONF: Lazy<GlobalConfig> = Lazy::new(|| {
-    serde_json::from_reader(
-        File::open(
-            std::env::args()
-                .nth(1)
-                .expect("First argument must specify the config.json to use."),
-        )
-        .unwrap(),
-    )
-    .unwrap()
-});
-
 fn main() {
     enable_logging();
     #[cfg(feature = "bypass-auth")]
-- 
cgit v1.2.3-70-g09d2