X-Git-Url: http://these/git/?a=blobdiff_plain;f=src%2Fmain.rs;h=9ef2f541d27fa943d7d9facd6a7b6f0a2aeede55;hb=235cc8b22897bfb3e71ba3dbd725d36863fea8ba;hp=3c0bf3f0206e1f718d4719d4d5dfbe4b0f5fcd37;hpb=276a8c2bd3e4fd1323e66b808675cf14cf6f75c5;p=lemmy.git

diff --git a/src/main.rs b/src/main.rs
index 3c0bf3f0..9ef2f541 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,8 +12,13 @@ use diesel_migrations::EmbeddedMigrations;
 use doku::json::{AutoComments, Formatting};
 use lemmy_api::match_websocket_operation;
 use lemmy_api_common::{
+  lemmy_db_views::structs::SiteView,
   request::build_user_agent,
-  utils::{blocking, check_private_instance_and_federation_enabled},
+  utils::{
+    blocking,
+    check_private_instance_and_federation_enabled,
+    local_site_rate_limit_to_rate_limit_config,
+  },
 };
 use lemmy_api_crud::match_websocket_operation_crud;
 use lemmy_db_schema::{source::secret::Secret, utils::get_database_url_from_env};
@@ -77,12 +82,12 @@ async fn main() -> Result<(), LemmyError> {
     .unwrap_or_else(|_| panic!("Error connecting to {}", db_url));
 
   // Run the migrations from code
-  let protocol_and_hostname = settings.get_protocol_and_hostname();
+  let settings_cloned = settings.to_owned();
   blocking(&pool, move |conn| {
     let _ = conn
       .run_pending_migrations(MIGRATIONS)
       .map_err(|_| LemmyError::from_message("Couldn't run migrations"))?;
-    run_advanced_migrations(conn, &protocol_and_hostname)?;
+    run_advanced_migrations(conn, &settings_cloned)?;
     Ok(()) as Result<(), LemmyError>
   })
   .await??;
@@ -93,16 +98,32 @@ async fn main() -> Result<(), LemmyError> {
     scheduled_tasks::setup(pool2).expect("Couldn't set up scheduled_tasks");
   });
 
+  // Initialize the secrets
+  let conn = &mut pool.get()?;
+  let secret = Secret::init(conn).expect("Couldn't initialize secrets.");
+
+  // Make sure the local site is set up.
+  let site_view = SiteView::read_local(conn).expect("local site not set up");
+  let local_site = site_view.local_site;
+  let federation_enabled = local_site.federation_enabled;
+
+  if federation_enabled {
+    println!("federation enabled, host is {}", &settings.hostname);
+  }
+
+  check_private_instance_and_federation_enabled(&local_site)?;
+
   // Set up the rate limiter
+  let rate_limit_config =
+    local_site_rate_limit_to_rate_limit_config(&site_view.local_site_rate_limit);
+
+  // TODO this isn't live-updating
+  // https://github.com/LemmyNet/lemmy/issues/2508
   let rate_limiter = RateLimit {
     rate_limiter: Arc::new(Mutex::new(RateLimiter::default())),
-    rate_limit_config: settings.rate_limit.to_owned().unwrap_or_default(),
+    rate_limit_config,
   };
 
-  // Initialize the secrets
-  let conn = &mut pool.get()?;
-  let secret = Secret::init(conn).expect("Couldn't initialize secrets.");
-
   println!(
     "Starting http server at {}:{}",
     settings.bind, settings.port
@@ -130,8 +151,6 @@ async fn main() -> Result<(), LemmyError> {
     .with(TracingMiddleware::default())
     .build();
 
-  check_private_instance_and_federation_enabled(&pool, &settings).await?;
-
   let chat_server = ChatServer::startup(
     pool.clone(),
     rate_limiter.clone(),
@@ -161,11 +180,15 @@ async fn main() -> Result<(), LemmyError> {
       .app_data(Data::new(rate_limiter.clone()))
       // The routes
       .configure(|cfg| api_routes::config(cfg, &rate_limiter))
-      .configure(|cfg| lemmy_apub::http::routes::config(cfg, &settings))
+      .configure(|cfg| {
+        if federation_enabled {
+          lemmy_apub::http::routes::config(cfg);
+          webfinger::config(cfg);
+        }
+      })
       .configure(feeds::config)
       .configure(|cfg| images::config(cfg, pictrs_client.clone(), &rate_limiter))
       .configure(nodeinfo::config)
-      .configure(|cfg| webfinger::config(cfg, &settings))
   })
   .bind((settings_bind.bind, settings_bind.port))?
   .run()