diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml index 1a19271541..42ee7bf132 100644 --- a/.github/BOTMETA.yml +++ b/.github/BOTMETA.yml @@ -800,6 +800,8 @@ files: $module_utils/network/aci: maintainers: $team_aci labels: networking + $module_utils/acme.py: + maintainers: mgruener resmo felixfontein $module_utils/network/aireos: maintainers: jmighion labels: networking @@ -865,8 +867,6 @@ files: labels: clustering $module_utils/keycloak.py: maintainers: eikef - $module_utils/letsencrypt.py: - maintainers: mgruener resmo felixfontein $module_utils/manageiq.py: maintainers: $team_manageiq $module_utils/network/meraki: diff --git a/lib/ansible/module_utils/letsencrypt.py b/lib/ansible/module_utils/acme.py similarity index 100% rename from lib/ansible/module_utils/letsencrypt.py rename to lib/ansible/module_utils/acme.py diff --git a/lib/ansible/modules/web_infrastructure/acme_account.py b/lib/ansible/modules/web_infrastructure/acme_account.py index b03015d5a7..700bf8af4d 100644 --- a/lib/ansible/modules/web_infrastructure/acme_account.py +++ b/lib/ansible/modules/web_infrastructure/acme_account.py @@ -25,7 +25,7 @@ description: (CA), run for the public's benefit. For details see U(https://letsencrypt.org)." - "This module only works with the ACME v2 protocol." extends_documentation_fragment: - - letsencrypt + - acme options: state: description: @@ -111,7 +111,7 @@ account_uri: type: string ''' -from ansible.module_utils.letsencrypt import ( +from ansible.module_utils.acme import ( ModuleFailException, ACMEAccount ) diff --git a/lib/ansible/modules/web_infrastructure/acme_certificate.py b/lib/ansible/modules/web_infrastructure/acme_certificate.py index 354239266e..8706764fe6 100644 --- a/lib/ansible/modules/web_infrastructure/acme_certificate.py +++ b/lib/ansible/modules/web_infrastructure/acme_certificate.py @@ -43,7 +43,7 @@ description: - "Note: this module was called C(letsencrypt) before Ansible 2.6. The usage did not change." extends_documentation_fragment: - - letsencrypt + - acme options: account_email: description: @@ -291,7 +291,7 @@ account_uri: version_added: "2.5" ''' -from ansible.module_utils.letsencrypt import ( +from ansible.module_utils.acme import ( ModuleFailException, fetch_url, write_file, nopad_b64, simple_get, ACMEAccount ) diff --git a/lib/ansible/utils/module_docs_fragments/letsencrypt.py b/lib/ansible/utils/module_docs_fragments/acme.py similarity index 100% rename from lib/ansible/utils/module_docs_fragments/letsencrypt.py rename to lib/ansible/utils/module_docs_fragments/acme.py