From 4e3385ca2edc6ee380ed7200cc4ae3ea259092ca Mon Sep 17 00:00:00 2001 From: Christopher Grau <66788631+beechesII@users.noreply.github.com> Date: Fri, 1 Dec 2023 09:12:41 +0100 Subject: [PATCH] allow to skip installation of prerequisites (#108) * allow to skip installation of prerequisites * fix codespell check --- docs/http-challenge/s3.md | 13 +++++++------ roles/acme/defaults/main.yml | 1 + roles/acme/tasks/challenge/http-01/s3.yml | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/http-challenge/s3.md b/docs/http-challenge/s3.md index 01a5393..9420f14 100644 --- a/docs/http-challenge/s3.md +++ b/docs/http-challenge/s3.md @@ -1,11 +1,12 @@ # Variables for s3 http-challenge -| Variable | Required | Default | Description -|-----------------------|----------|-----------|------------ -| acme_s3_bucket_name | yes | | name of the s3 bucket which should be used -| acme_s3_access_key | yes | | aws access key for API user of s3 bucket -| acme_s3_secret_key | yes | | aws secret key for API user of s3 bucket -| acme_s3_config_region | no | us-west-1 | aws s3 region in which bucket can be found +| Variable | Required | Default | Description +|-------------------------------|----------|-----------|------------ +| acme_s3_bucket_name | yes | | name of the s3 bucket which should be used +| acme_s3_access_key | yes | | aws access key for API user of s3 bucket +| acme_s3_secret_key | yes | | aws secret key for API user of s3 bucket +| acme_s3_config_region | no | us-west-1 | aws s3 region in which bucket can be found +| acme_s3_install_prerequisites | no | true | install python-boto3 as prerequisite for s3 challenge file upload ## Validation diff --git a/roles/acme/defaults/main.yml b/roles/acme/defaults/main.yml index cd52220..81aff12 100644 --- a/roles/acme/defaults/main.yml +++ b/roles/acme/defaults/main.yml @@ -19,5 +19,6 @@ acme_remaining_days: "30" ### provider specific config acme_s3_config_region: eu-west-1 +acme_s3_install_prerequisites: true acme_local_validation_path: /var/www/html acme_azure_purge_state: absent diff --git a/roles/acme/tasks/challenge/http-01/s3.yml b/roles/acme/tasks/challenge/http-01/s3.yml index 75b52b6..e0f0d0e 100644 --- a/roles/acme/tasks/challenge/http-01/s3.yml +++ b/roles/acme/tasks/challenge/http-01/s3.yml @@ -6,6 +6,8 @@ - python-boto3 state: present use: "{{ acme_prerequisites_packagemanager }}" + when: + - acme_s3_install_prerequisites | bool - name: Validate challenge only if it is created or changed # noqa no-handler when: acme_challenge is changed