move acl to pbs_config workspaces, pbs_api_types cleanups
This commit is contained in:
1064
src/config/acl.rs
1064
src/config/acl.rs
File diff suppressed because it is too large
Load Diff
@ -9,9 +9,10 @@ use lazy_static::lazy_static;
|
||||
use proxmox::api::UserInformation;
|
||||
use proxmox::tools::time::epoch_i64;
|
||||
|
||||
use super::acl::{AclTree, ROLE_NAMES, ROLE_ADMIN};
|
||||
use pbs_api_types::{Authid, Userid, ROLE_ADMIN};
|
||||
use pbs_config::acl::{AclTree, ROLE_NAMES};
|
||||
|
||||
use super::user::{ApiToken, User};
|
||||
use crate::api2::types::{Authid, Userid};
|
||||
use crate::tools::Memcom;
|
||||
|
||||
/// Cache User/Group/Token/Acl configuration data for fast permission tests
|
||||
@ -54,7 +55,7 @@ impl CachedUserInfo {
|
||||
|
||||
let config = Arc::new(CachedUserInfo {
|
||||
user_cfg: super::user::cached_config()?,
|
||||
acl_tree: super::acl::cached_config()?,
|
||||
acl_tree: pbs_config::acl::cached_config()?,
|
||||
});
|
||||
|
||||
let mut cache = CACHED_CONFIG.write().unwrap();
|
||||
|
@ -14,7 +14,6 @@ use proxmox::try_block;
|
||||
|
||||
use pbs_buildcfg::{self, configdir};
|
||||
|
||||
pub mod acl;
|
||||
pub mod acme;
|
||||
pub mod cached_user_info;
|
||||
pub mod datastore;
|
||||
|
Reference in New Issue
Block a user