diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-02-18 20:43:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-18 20:43:12 +0100 |
| commit | 2ee738daaf35cd4dc8ec0e8b08ba96b443ca10a1 (patch) | |
| tree | b2c6b2cb4aa16954d13da92fd6bced8083452d65 /src | |
| parent | 1db5a06efe31d43c12847663990e7945ca465206 (diff) | |
| parent | 5f0e9a8ceb6e447fe77d38d132476f910733d4e9 (diff) | |
| download | vyos-1x-2ee738daaf35cd4dc8ec0e8b08ba96b443ca10a1.tar.gz vyos-1x-2ee738daaf35cd4dc8ec0e8b08ba96b443ca10a1.zip | |
Merge pull request #4350 from Embezzle/T7176
firewall: T7176: Fix vyos-domain-resolver not respecting interval/cache configuration
Diffstat (limited to 'src')
| -rwxr-xr-x | src/services/vyos-domain-resolver | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/services/vyos-domain-resolver b/src/services/vyos-domain-resolver index bfc8caa0a..48c6b86d8 100755 --- a/src/services/vyos-domain-resolver +++ b/src/services/vyos-domain-resolver @@ -65,13 +65,15 @@ def get_config(conf, node): node_config = dict_merge(default_values, node_config) - global timeout, cache + if node == base_firewall and 'global_options' in node_config: + global_config = node_config['global_options'] + global timeout, cache - if 'resolver_interval' in node_config: - timeout = int(node_config['resolver_interval']) + if 'resolver_interval' in global_config: + timeout = int(global_config['resolver_interval']) - if 'resolver_cache' in node_config: - cache = True + if 'resolver_cache' in global_config: + cache = True fqdn_config_parse(node_config, node[0]) |