diff options
| -rwxr-xr-x | wg-genconf.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/wg-genconf.py b/wg-genconf.py index 8c9552d..a8e8886 100755 --- a/wg-genconf.py +++ b/wg-genconf.py @@ -5,6 +5,7 @@ import argparse import collections import copy +import domllib import functools import io import ipaddress @@ -13,7 +14,6 @@ import re import shutil import string import sys -import tomllib class Network(dict): @@ -307,10 +307,6 @@ def create_if_files(if_, output_dir): def load_network_peer_interfaces(config, peer): ifs = peer.pop('if', {}) - for ifset_name in peer.pop('ifsets', []): - for if_name, if_conf in config['ifset'][ifset_name]['if'].items(): - ifs.setdefault(if_name, copy.deepcopy(if_conf)) - for if_name, if_conf in ifs.items(): # remove self from interface peers peers = [x for x in if_conf['peers'] if x.get('name') != peer.name] @@ -366,13 +362,13 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument( '-c', '--config', dest='config_file', - default='~/.wg-genconf/config.toml') + default='~/.wg-genconf/config.doml') parser.add_argument('-o', '--output-dir', default='.', type=argparse_dir) parser.add_argument('peer_name') args = parser.parse_args() with open(os.path.expanduser(args.config_file), 'rb') as f: - config = tomllib.load(f) + config = domllib.load(f) networks = load_networks(config) if not config['peer'].get(args.peer_name): |