From 6eafafe5297c54aa5cb38790c45ba189b47d755e Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 1 Aug 2023 21:52:53 +0200
Subject: remote downloa

---
 server/src/main.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/server/src/main.rs b/server/src/main.rs
index eba9532..341f72b 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -5,19 +5,20 @@
 */
 #![feature(lazy_cell)]
 
-use config::{load_global_config, GlobalConfig};
+use std::fs::File;
 use database::Database;
+use jellycommon::config::GlobalConfig;
 use jellyremuxer::RemuxerContext;
 use once_cell::sync::Lazy;
 use rocket::launch;
 use routes::build_rocket;
 
-pub mod config;
 pub mod database;
 pub mod import;
 pub mod routes;
 
-pub static CONF: Lazy<GlobalConfig> = Lazy::new(load_global_config);
+pub static CONF: Lazy<GlobalConfig> =
+    Lazy::new(|| serde_json::from_reader(File::open("data/config.json").unwrap()).unwrap());
 
 #[launch]
 fn rocket() -> _ {
-- 
cgit v1.2.3-70-g09d2