From 5507f53718b346b1522ef50671a2bc9d6be78a3b Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 4 Dec 2021 15:50:37 -0500 Subject: [PATCH] Adding private instance to site setup. --- config/defaults.hjson | 1 + crates/api_common/src/site.rs | 1 + crates/api_crud/src/site/read.rs | 1 + crates/utils/src/settings/structs.rs | 2 ++ 4 files changed, 5 insertions(+) diff --git a/config/defaults.hjson b/config/defaults.hjson index cf4bdf541..d894d25b3 100644 --- a/config/defaults.hjson +++ b/config/defaults.hjson @@ -100,6 +100,7 @@ require_email_verification: true require_application: true application_question: "string" + private_instance: true } # the domain name of your instance (mandatory) hostname: "unset" diff --git a/crates/api_common/src/site.rs b/crates/api_common/src/site.rs index a2ad7ae16..fc679c8ad 100644 --- a/crates/api_common/src/site.rs +++ b/crates/api_common/src/site.rs @@ -101,6 +101,7 @@ pub struct CreateSite { pub require_email_verification: Option, pub require_application: Option, pub application_question: Option, + pub private_instance: Option, pub auth: String, } diff --git a/crates/api_crud/src/site/read.rs b/crates/api_crud/src/site/read.rs index a69f68182..4438075db 100644 --- a/crates/api_crud/src/site/read.rs +++ b/crates/api_crud/src/site/read.rs @@ -66,6 +66,7 @@ impl PerformCrud for GetSite { require_email_verification: setup.require_email_verification, require_application: setup.require_application, application_question: setup.application_question.to_owned(), + private_instance: setup.private_instance, auth: admin_jwt, }; create_site.perform(context, websocket_id).await?; diff --git a/crates/utils/src/settings/structs.rs b/crates/utils/src/settings/structs.rs index 99f208414..8f0085e93 100644 --- a/crates/utils/src/settings/structs.rs +++ b/crates/utils/src/settings/structs.rs @@ -193,4 +193,6 @@ pub struct SetupConfig { pub require_application: Option, #[default(None)] pub application_question: Option, + #[default(None)] + pub private_instance: Option, }