From 30fa96a7f43eb7568b7df1e1fdb6e1885f3b4f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Wed, 27 Oct 2021 20:50:55 +0200 Subject: [PATCH] aquatic_ws: use PrivilegeConfig from aquatic_common --- aquatic_ws/src/lib/config.rs | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/aquatic_ws/src/lib/config.rs b/aquatic_ws/src/lib/config.rs index b7ef10c..c0cd032 100644 --- a/aquatic_ws/src/lib/config.rs +++ b/aquatic_ws/src/lib/config.rs @@ -1,6 +1,6 @@ use std::net::SocketAddr; -use aquatic_common::access_list::AccessListConfig; +use aquatic_common::{access_list::AccessListConfig, privileges::PrivilegeConfig}; use serde::{Deserialize, Serialize}; use aquatic_cli_helpers::LogLevel; @@ -84,17 +84,6 @@ pub struct StatisticsConfig { pub interval: u64, } -#[derive(Clone, Debug, Serialize, Deserialize)] -#[serde(default)] -pub struct PrivilegeConfig { - /// Chroot and switch user after binding to sockets - pub drop_privileges: bool, - /// Chroot to this path - pub chroot_path: String, - /// User to switch to after chrooting - pub user: String, -} - impl Default for Config { fn default() -> Self { Self { @@ -162,13 +151,3 @@ impl Default for StatisticsConfig { Self { interval: 0 } } } - -impl Default for PrivilegeConfig { - fn default() -> Self { - Self { - drop_privileges: false, - chroot_path: ".".to_string(), - user: "nobody".to_string(), - } - } -}