diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-21 16:35:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 16:35:32 +0100 |
| commit | 04f745123a71c1ae330b02e263fa42e310aee4da (patch) | |
| tree | 1192a9b753dc8cf5660f8bc46a4e0e503eb5419b /src/conf_mode/nat66.py | |
| parent | c9b71b0669924da41dc50632bdcaed710f03d4d7 (diff) | |
| parent | eac5251c4c804c580fe9f3c3d6c6f6e355fca6d1 (diff) | |
| download | vyos-1x-04f745123a71c1ae330b02e263fa42e310aee4da.tar.gz vyos-1x-04f745123a71c1ae330b02e263fa42e310aee4da.zip | |
Merge pull request #2673 from vyos/mergify/bp/sagitta/pr-2665
T2898: add ndp-proxy service (backport #2665)
Diffstat (limited to 'src/conf_mode/nat66.py')
| -rwxr-xr-x | src/conf_mode/nat66.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py index 3f7185e67..393be998f 100755 --- a/src/conf_mode/nat66.py +++ b/src/conf_mode/nat66.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2020-2021 VyOS maintainers and contributors +# Copyright (C) 2020-2023 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -35,7 +35,6 @@ airbag.enable() k_mod = ['nft_nat', 'nft_chain_nat'] nftables_nat66_config = '/run/nftables_nat66.nft' -ndppd_config = '/run/ndppd/ndppd.conf' def get_handler(json, chain, target): """ Get nftable rule handler number of given chain/target combination. @@ -141,7 +140,6 @@ def generate(nat): nat['first_install'] = True render(nftables_nat66_config, 'firewall/nftables-nat66.j2', nat, permission=0o755) - render(ndppd_config, 'ndppd/ndppd.conf.j2', nat, permission=0o755) return None def apply(nat): @@ -149,6 +147,7 @@ def apply(nat): return None cmd(f'nft -f {nftables_nat66_config}') +<<<<<<< HEAD if 'deleted' in nat or not dict_search('source.rule', nat): cmd('systemctl stop ndppd') @@ -156,6 +155,9 @@ def apply(nat): os.unlink(ndppd_config) else: cmd('systemctl restart ndppd') +======= + call_dependents() +>>>>>>> 4d721a580 (T2898: add ndp-proxy service) return None |