move acl to pbs_config workspaces, pbs_api_types cleanups

This commit is contained in:
Dietmar Maurer
2021-09-09 10:32:44 +02:00
parent 1cb08a0a05
commit 8cc3760e74
58 changed files with 1064 additions and 1161 deletions

File diff suppressed because it is too large Load Diff

View File

@ -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();

View File

@ -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;