1
0
Fork 0
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git synced 2023-02-13 20:55:02 -05:00

hagridctl: Adapt import to sqlite backend.

This commit is contained in:
Nora Widdecke 2022-01-19 15:21:56 +01:00
parent a920d3ad9b
commit fd218bebba
2 changed files with 4 additions and 8 deletions

View file

@ -114,15 +114,12 @@ impl <'a> ImportStats<'a> {
fn import_from_files( fn import_from_files(
config: &HagridConfig, config: &HagridConfig,
dry_run: bool, _dry_run: bool,
input_files: Vec<PathBuf>, input_files: Vec<PathBuf>,
multi_progress: Arc<MultiProgress>, multi_progress: Arc<MultiProgress>,
) -> Result<()> { ) -> Result<()> {
let db = KeyDatabase::new_internal( let db = KeyDatabase::new(
config.keys_internal_dir.as_ref().unwrap(), config.keys_base_dir.as_ref().unwrap(),
config.keys_external_dir.as_ref().unwrap(),
config.tmp_dir.as_ref().unwrap(),
dry_run,
)?; )?;
for input_file in input_files { for input_file in input_files {

View file

@ -36,8 +36,7 @@ pub struct HagridConfigs {
#[derive(Deserialize,Clone)] #[derive(Deserialize,Clone)]
pub struct HagridConfig { pub struct HagridConfig {
_template_dir: Option<PathBuf>, _template_dir: Option<PathBuf>,
keys_internal_dir: Option<PathBuf>, keys_base_dir: Option<PathBuf>,
keys_external_dir: Option<PathBuf>,
_assets_dir: Option<PathBuf>, _assets_dir: Option<PathBuf>,
_token_dir: Option<PathBuf>, _token_dir: Option<PathBuf>,
tmp_dir: Option<PathBuf>, tmp_dir: Option<PathBuf>,