Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add server-cli option to disable auth

Browse Source
This commit is contained in:
Imbris 2020-09-20 00:51:20 -04:00
parent 873ea1ec46
commit 66d2d636ee
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server-cli/src/main.rs
View File

@ -41,24 +41,26 @@ fn main() -> io::Result<()> {
.version(common::util::DISPLAY_VERSION_LONG.as_str()) .version(common::util::DISPLAY_VERSION_LONG.as_str())
.author("The veloren devs <https://gitlab.com/veloren/veloren>") .author("The veloren devs <https://gitlab.com/veloren/veloren>")
.about("The veloren server cli provides an easy to use interface to start a veloren server") .about("The veloren server cli provides an easy to use interface to start a veloren server")
.arg( .args(&[
Arg::with_name("basic") Arg::with_name("basic")
.short("b") .short("b")
.long("basic") .long("basic")
.help("Disables the tui") .help("Disables the tui")
.takes_value(false), .takes_value(false),
)
.arg(
Arg::with_name("interactive") Arg::with_name("interactive")
.short("i") .short("i")
.long("interactive") .long("interactive")
.help("Enables command input for basic mode") .help("Enables command input for basic mode")
.takes_value(false), .takes_value(false),
) Arg::with_name("no-auth")
.long("no-auth")
.help("Runs without auth enabled"),
])
.get_matches(); .get_matches();
let basic = matches.is_present("basic"); let basic = matches.is_present("basic");
let interactive = matches.is_present("interactive"); let interactive = matches.is_present("interactive");
let no_auth = matches.is_present("no-auth");
let sigusr1_signal = Arc::new(AtomicBool::new(false)); let sigusr1_signal = Arc::new(AtomicBool::new(false));
@ -126,7 +128,12 @@ fn main() -> io::Result<()> {
let mut clock = Clock::start(); let mut clock = Clock::start();
// Load settings // Load settings
let settings = ServerSettings::load(); let mut settings = ServerSettings::load();
// TODO: make settings file immutable so that this does not overwrite the
// settings
if no_auth {
settings.auth_server_address = None;
}
let server_port = &settings.gameserver_address.port(); let server_port = &settings.gameserver_address.port();
let metrics_port = &settings.metrics_address.port(); let metrics_port = &settings.metrics_address.port();
// Create server // Create server