Automatic instance setup based on config variables (fixes #404)
This commit is contained in:
parent
b13febd34a
commit
c12fd12d9c
5 changed files with 75 additions and 18 deletions
11
docker/lemmy.hjson
vendored
11
docker/lemmy.hjson
vendored
|
@ -41,7 +41,16 @@
|
||||||
# interval length for registration limit
|
# interval length for registration limit
|
||||||
register_per_second: 3600
|
register_per_second: 3600
|
||||||
}
|
}
|
||||||
# # email sending configuration
|
# # optional: parameters for automatic configuration of new instance (only used at first start)
|
||||||
|
# setup: {
|
||||||
|
# # username for the admin user
|
||||||
|
# admin_username: "lemmy"
|
||||||
|
# # password for the admin user
|
||||||
|
# admin_password: "lemmy"
|
||||||
|
# # name of the site (can be changed later)
|
||||||
|
# site_name: "Lemmy Test"
|
||||||
|
# }
|
||||||
|
# # optional: email sending configuration
|
||||||
# email: {
|
# email: {
|
||||||
# # hostname of the smtp server
|
# # hostname of the smtp server
|
||||||
# smtp_server: ""
|
# smtp_server: ""
|
||||||
|
|
11
server/config/defaults.hjson
vendored
11
server/config/defaults.hjson
vendored
|
@ -1,4 +1,15 @@
|
||||||
{
|
{
|
||||||
|
# # optional: parameters for automatic configuration of new instance (only used at first start)
|
||||||
|
# setup: {
|
||||||
|
# # username for the admin user
|
||||||
|
# admin_username: ""
|
||||||
|
# # password for the admin user
|
||||||
|
# admin_password: ""
|
||||||
|
# # optional: email for the admin user (can be omitted and set later through the website)
|
||||||
|
# admin_email: ""
|
||||||
|
# # name of the site (can be changed later)
|
||||||
|
# site_name: ""
|
||||||
|
# }
|
||||||
# settings related to the postgresql database
|
# settings related to the postgresql database
|
||||||
database: {
|
database: {
|
||||||
# username to connect to postgres
|
# username to connect to postgres
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
use super::*;
|
use super::*;
|
||||||
|
use crate::api::user::Register;
|
||||||
|
use crate::api::{Oper, Perform};
|
||||||
|
use crate::settings::Settings;
|
||||||
use diesel::PgConnection;
|
use diesel::PgConnection;
|
||||||
|
use log::info;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
|
@ -53,12 +57,12 @@ pub struct GetModlogResponse {
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
pub struct CreateSite {
|
pub struct CreateSite {
|
||||||
name: String,
|
pub name: String,
|
||||||
description: Option<String>,
|
pub description: Option<String>,
|
||||||
enable_downvotes: bool,
|
pub enable_downvotes: bool,
|
||||||
open_registration: bool,
|
pub open_registration: bool,
|
||||||
enable_nsfw: bool,
|
pub enable_nsfw: bool,
|
||||||
auth: String,
|
pub auth: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
|
@ -277,10 +281,34 @@ impl Perform<GetSiteResponse> for Oper<GetSite> {
|
||||||
fn perform(&self, conn: &PgConnection) -> Result<GetSiteResponse, Error> {
|
fn perform(&self, conn: &PgConnection) -> Result<GetSiteResponse, Error> {
|
||||||
let _data: &GetSite = &self.data;
|
let _data: &GetSite = &self.data;
|
||||||
|
|
||||||
// It can return a null site in order to redirect
|
let site = Site::read(&conn, 1);
|
||||||
let site_view = match Site::read(&conn, 1) {
|
let site_view = if site.is_ok() {
|
||||||
Ok(_site) => Some(SiteView::read(&conn)?),
|
Some(SiteView::read(&conn)?)
|
||||||
Err(_e) => None,
|
} else if let Some(setup) = Settings::get().setup.as_ref() {
|
||||||
|
let register = Register {
|
||||||
|
username: setup.admin_username.to_owned(),
|
||||||
|
email: setup.admin_email.to_owned(),
|
||||||
|
password: setup.admin_password.to_owned(),
|
||||||
|
password_verify: setup.admin_password.to_owned(),
|
||||||
|
admin: true,
|
||||||
|
show_nsfw: true,
|
||||||
|
};
|
||||||
|
let login_response = Oper::new(register).perform(&conn)?;
|
||||||
|
info!("Admin {} created", setup.admin_username);
|
||||||
|
|
||||||
|
let create_site = CreateSite {
|
||||||
|
name: setup.site_name.to_owned(),
|
||||||
|
description: None,
|
||||||
|
enable_downvotes: false,
|
||||||
|
open_registration: false,
|
||||||
|
enable_nsfw: false,
|
||||||
|
auth: login_response.jwt,
|
||||||
|
};
|
||||||
|
Oper::new(create_site).perform(&conn)?;
|
||||||
|
info!("Site {} created", setup.site_name);
|
||||||
|
Some(SiteView::read(&conn)?)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut admins = UserView::admins(&conn)?;
|
let mut admins = UserView::admins(&conn)?;
|
||||||
|
|
|
@ -14,12 +14,12 @@ pub struct Login {
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
pub struct Register {
|
pub struct Register {
|
||||||
username: String,
|
pub username: String,
|
||||||
email: Option<String>,
|
pub email: Option<String>,
|
||||||
password: String,
|
pub password: String,
|
||||||
password_verify: String,
|
pub password_verify: String,
|
||||||
admin: bool,
|
pub admin: bool,
|
||||||
show_nsfw: bool,
|
pub show_nsfw: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
|
@ -42,7 +42,7 @@ pub struct SaveUserSettings {
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
pub struct LoginResponse {
|
pub struct LoginResponse {
|
||||||
jwt: String,
|
pub jwt: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize, Deserialize)]
|
||||||
|
|
|
@ -9,6 +9,7 @@ static CONFIG_FILE: &str = "config/config.hjson";
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
pub struct Settings {
|
pub struct Settings {
|
||||||
|
pub setup: Option<Setup>,
|
||||||
pub database: Database,
|
pub database: Database,
|
||||||
pub hostname: String,
|
pub hostname: String,
|
||||||
pub bind: IpAddr,
|
pub bind: IpAddr,
|
||||||
|
@ -20,6 +21,14 @@ pub struct Settings {
|
||||||
pub federation_enabled: bool,
|
pub federation_enabled: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize)]
|
||||||
|
pub struct Setup {
|
||||||
|
pub admin_username: String,
|
||||||
|
pub admin_password: String,
|
||||||
|
pub admin_email: Option<String>,
|
||||||
|
pub site_name: String,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
pub struct RateLimitConfig {
|
pub struct RateLimitConfig {
|
||||||
pub message: i32,
|
pub message: i32,
|
||||||
|
|
Reference in a new issue