move all direct database access to logic crate

1 files changed, 2 insertions, 9 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index 5113542..7c7bbd2 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -7,9 +7,7 @@
 #![allow(clippy::needless_borrows_for_generic_args)]
 #![recursion_limit = "4096"]
 
-use anyhow::Context;
 use config::load_config;
-use jellylogic::Database;
 use jellylogic::{admin::log::enable_logging, login::create_admin_account};
 use log::{error, info, warn};
 use routes::build_rocket;
@@ -28,7 +26,6 @@ pub mod ui;
 #[rustfmt::skip]
 #[derive(Debug, Deserialize, Serialize, Default)]
 pub struct Config {
-    database_path: PathBuf,
     asset_path: PathBuf,
     cookie_key: Option<String>,
     tls:bool,
@@ -56,15 +53,11 @@ async fn main() {
     #[cfg(feature = "bypass-auth")]
     log::warn!("authentification bypass enabled");
 
-    let database = Database::open(&CONF.database_path)
-        .context("opening database")
-        .unwrap();
-
-    if let Err(e) = create_admin_account(&database) {
+    if let Err(e) = create_admin_account() {
         error!("failed to create admin account: {e:?}");
     }
 
-    let r = build_rocket(database).launch().await;
+    let r = build_rocket().launch().await;
     match r {
         Ok(_) => warn!("server shutdown"),
         Err(e) => error!("server exited: {e}"),