diff --git a/bundles/powerdns/items.py b/bundles/powerdns/items.py index 329694a..b6a5e8f 100644 --- a/bundles/powerdns/items.py +++ b/bundles/powerdns/items.py @@ -2,6 +2,7 @@ from datetime import datetime from os import listdir from os.path import isfile, join from subprocess import check_output + from bundlewrap.utils.ui import io zone_path = join(repo.path, 'data', 'powerdns', 'files', 'bind-zones') diff --git a/bundles/pppd/files/dyndns b/bundles/pppd/files/dyndns index 5058b2f..633915f 100644 --- a/bundles/pppd/files/dyndns +++ b/bundles/pppd/files/dyndns @@ -7,7 +7,6 @@ from subprocess import check_output from requests import get - UPDATE_URL = '${url}' USERNAME = '${username}' PASSWORD = '${password}' diff --git a/bundles/pppd/files/dyndns_periodic b/bundles/pppd/files/dyndns_periodic index 236c4fc..353ee6d 100644 --- a/bundles/pppd/files/dyndns_periodic +++ b/bundles/pppd/files/dyndns_periodic @@ -5,7 +5,6 @@ from ipaddress import ip_address from json import loads from subprocess import check_output, run - DOMAIN = '${domain}' # <%text> diff --git a/bundles/routeros/metadata.py b/bundles/routeros/metadata.py index ca7979f..e987a4e 100644 --- a/bundles/routeros/metadata.py +++ b/bundles/routeros/metadata.py @@ -2,7 +2,6 @@ import re from json import load from os.path import join - with open(join(repo.path, 'configs', 'netbox', f'{node.name}.json')) as f: netbox = load(f) diff --git a/libs/demagify.py b/libs/demagify.py index 5fe492c..02180f0 100644 --- a/libs/demagify.py +++ b/libs/demagify.py @@ -1,5 +1,6 @@ import bwpass + def demagify(something, vault): if isinstance(something, str): if something.startswith('!bwpass:'): diff --git a/libs/ssh.py b/libs/ssh.py index 89c643a..fe3b9b4 100644 --- a/libs/ssh.py +++ b/libs/ssh.py @@ -4,9 +4,9 @@ from hashlib import sha3_224 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey from cryptography.hazmat.primitives.serialization import (Encoding, - NoEncryption, - PrivateFormat, - PublicFormat) + NoEncryption, + PrivateFormat, + PublicFormat) from bundlewrap.utils import Fault diff --git a/nodes/attributes.py b/nodes/attributes.py index 85fa36d..eda23f4 100644 --- a/nodes/attributes.py +++ b/nodes/attributes.py @@ -1,6 +1,7 @@ -from bundlewrap.utils.ui import io from bundlewrap.utils.scm import get_rev -from bundlewrap.utils.text import red, bold +from bundlewrap.utils.text import bold, red +from bundlewrap.utils.ui import io + @node_attribute def needs_apply(node):