diff --git a/rust/crates/zaprett/src/service.rs b/rust/crates/zaprett/src/service.rs index a009271..fedfd12 100644 --- a/rust/crates/zaprett/src/service.rs +++ b/rust/crates/zaprett/src/service.rs @@ -111,11 +111,11 @@ pub async fn start_service() -> anyhow::Result<()> { .into_iter() .map(|m| (m.id().clone(), m)) .collect(); - let strat_modified = prepare_manifests(&start, ®ex_hostlist, &hostlists, &tmp_dir)?; - let strat_modified = prepare_manifests(&strat_modified, ®ex_hostlist_exclude, &hostlists_exclude, &tmp_dir)?; - let strat_modified = prepare_manifests(&strat_modified, ®ex_ipset, &ipset, &tmp_dir)?; - let strat_modified = prepare_manifests(&strat_modified, ®ex_ipset_exclude, &ipset_exclude, &tmp_dir)?; - let strat_modified = prepare_manifests(&strat_modified, ®ex_bindir, &bins, &tmp_dir)?; + let strat_modified = prepare_manifests(&start, ®ex_hostlist, &hostlists, &tmp_dir, "txt")?; + let strat_modified = prepare_manifests(&strat_modified, ®ex_hostlist_exclude, &hostlists_exclude, &tmp_dir, "txt")?; + let strat_modified = prepare_manifests(&strat_modified, ®ex_ipset, &ipset, &tmp_dir, "txt")?; + let strat_modified = prepare_manifests(&strat_modified, ®ex_ipset_exclude, &ipset_exclude, &tmp_dir, "txt")?; + let strat_modified = prepare_manifests(&strat_modified, ®ex_bindir, &bins, &tmp_dir, "bin")?; let strat_modified = regex_hostlists.replace_all(&strat_modified, &hosts); let strat_modified = regex_ipsets.replace_all(&strat_modified, &ipsets); let strat_modified = diff --git a/rust/crates/zaprett/src/strategy.rs b/rust/crates/zaprett/src/strategy.rs index a42e9bb..63956cf 100644 --- a/rust/crates/zaprett/src/strategy.rs +++ b/rust/crates/zaprett/src/strategy.rs @@ -3,7 +3,7 @@ use regex::Regex; use std::collections::{HashMap, HashSet}; use std::path::{Path, PathBuf}; -pub fn prepare_manifests(input: &str, regex: &Regex, manifests: &HashMap, tmp_dir: &Path) -> anyhow::Result { +pub fn prepare_manifests(input: &str, regex: &Regex, manifests: &HashMap, tmp_dir: &Path, ext: &str) -> anyhow::Result { let required: HashSet = regex.captures_iter(input).map(|c| c[1].to_string()).collect(); let mut paths: HashMap = HashMap::new(); for id in &required { @@ -11,7 +11,8 @@ pub fn prepare_manifests(input: &str, regex: &Regex, manifests: &HashMap