Skip to content

Commit

Permalink
Version 3.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
adferrand committed Sep 10, 2020
1 parent 2990e57 commit 036527d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## master - CURRENT

## 3.7.0 - 11/09/2020
## Modified
* Upgrade Lexicon to 3.4.3 (add Njalla provider)
* Upgrade Certbot to 1.8.0
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "poetry.masonry.api"

[tool.poetry]
name = "dnsrobocert"
version = "3.6.0"
version = "3.7.0"
description = "A tool to manage your DNS-challenged TLS certificates"
license = "MIT"
keywords = [
Expand Down
8 changes: 6 additions & 2 deletions src/dnsrobocert/core/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ def main(args: List[str] = None) -> int:
globals()[parsed_args.type](dnsrobocert_config, parsed_args.lineage)
except BaseException as e:
print(
f"Error while executing the `{parsed_args.type}` hook:", file=sys.stderr,
f"Error while executing the `{parsed_args.type}` hook:",
file=sys.stderr,
)
print(e, file=sys.stderr)
traceback.print_exc(file=sys.stderr)
Expand Down Expand Up @@ -163,7 +164,10 @@ def deploy(dnsrobocert_config: Dict[str, Any], _no_lineage: Any):


def _txt_challenge(
profile: Dict[str, Any], token: str, domain: str, action: str = "create",
profile: Dict[str, Any],
token: str,
domain: str,
action: str = "create",
):
profile_name = profile["name"]
provider_name = profile["provider"]
Expand Down
12 changes: 3 additions & 9 deletions src/dnsrobocert/core/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,19 @@ def migrate(config_path):
}

for key, value in configs.get(provider, {}).items():
provider_config.setdefault("provider_options", {})[ # type: ignore
key
] = value
provider_config.setdefault("provider_options", {})[key] = value # type: ignore

env_key_prefix = "LEXICON_{0}_".format(provider.upper())
for key, value in envs.items():
if key.startswith(env_key_prefix):
provider_config.setdefault(
"provider_options", {} # type: ignore
)[
provider_config.setdefault("provider_options", {})[ # type: ignore
key.replace(env_key_prefix, "").lower()
] = value

_handle_specific_envs_variables(envs, migrated_config)

for key, value in args.get(provider, {}).items():
provider_config.setdefault("provider_options", {})[ # type: ignore
key
] = value
provider_config.setdefault("provider_options", {})[key] = value # type: ignore
if args.get("delegated"):
provider_config["delegated_subdomain"] = args.get("delegated")

Expand Down
4 changes: 3 additions & 1 deletion utils/create_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

def main():
git_clean = subprocess.check_output(
"git status --porcelain", shell=True, universal_newlines=True,
"git status --porcelain",
shell=True,
universal_newlines=True,
).strip()
if git_clean:
raise RuntimeError("Error, git workspace is not clean: \n{0}".format(git_clean))
Expand Down

0 comments on commit 036527d

Please sign in to comment.