From 368585d7b8e6cd527c5acdb405bba341f98280b1 Mon Sep 17 00:00:00 2001 From: egor-white Date: Mon, 9 Feb 2026 12:51:09 +0300 Subject: [PATCH] more flexible regex --- rust/crates/zaprett/src/service.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rust/crates/zaprett/src/service.rs b/rust/crates/zaprett/src/service.rs index 0f13e09..8a44ede 100644 --- a/rust/crates/zaprett/src/service.rs +++ b/rust/crates/zaprett/src/service.rs @@ -58,9 +58,10 @@ pub async fn start_service() -> anyhow::Result<()> { .map(Cow::Owned) .unwrap_or(Cow::Borrowed(DEFAULT_STRATEGY_NFQWS)); - let regex_hostlist = Regex::new(r"\$hostlist")?; - let regex_ipsets = Regex::new(r"\$ipset")?; - let regex_zaprettdir = Regex::new(r"\$\{?zaprettdir}?")?; + let regex_hostlist = Regex::new(r"\$(?:hostlist|\{hostlist})")?; + let regex_ipsets = Regex::new(r"\$(?:ipset|\{ipset})")?; + let regex_zaprettdir = Regex::new(r"\$(?:zaprettdir|\{zaprettdir})")?; + let regex_libsdir = Regex::new(r"\$(?:hostlist|\{hostlist})")?; let mut strat_modified; let (hosts, ipsets) = config.list_type().merge(&config).await;