From d8d6115f7bff4e66be5e77d5a345cf0723be5cd0 Mon Sep 17 00:00:00 2001 From: RIBEIRO David Date: Fri, 1 Dec 2017 19:23:58 +0100 Subject: [PATCH] Correcting some typo error + clean up debug comments : + Changing min ansible version compatibility + Correcting some error (wellknow => wellknown) - Removing debug comments --- CHANGELOG.md | 10 +++++++++- meta/main.yml | 2 +- tasks/main.yml | 4 ++-- tasks/providers/http-01/wellknown.yml | 14 ++------------ tasks/{wellknow.yml => wellknown.yml} | 0 5 files changed, 14 insertions(+), 16 deletions(-) rename tasks/{wellknow.yml => wellknown.yml} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4054a88..443123f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 1.1.1 + +### changed +- Correcting some typo error (wellknow => wellknown) + +### Removed +- Debug comments + ## 1.1.0 ### Added -- http-01 (wellknow acme-challenge) support. +- http-01 (wellknown acme-challenge) support. - SSL crt & key concatenation for HAProxy compatibility. - Ansible Galaxy file structure (to be used with ansible-galaxy install git@...). diff --git a/meta/main.yml b/meta/main.yml index 1e0a67b..a9add48 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,7 +16,7 @@ galaxy_info: # - CC-BY license: license (GPLv2, CC-BY, etc) - min_ansible_version: 1.2 + min_ansible_version: 2.4 # If this a Container Enabled role, provide the minimum Ansible Container version. # min_ansible_container_version: diff --git a/tasks/main.yml b/tasks/main.yml index 17964a6..49d7e7b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,7 +2,7 @@ - include: "dependencies.yml" # Create the /.well-known/acme-challenge dir -- include: "wellknow.yml" +- include: "wellknown.yml" vars: lets_encrypt_resource_state: present when: @@ -14,7 +14,7 @@ # Remove the /.well-known/acme-challenge dir -- include: "wellknow.yml" +- include: "wellknown.yml" vars: lets_encrypt_resource_state: absent when: diff --git a/tasks/providers/http-01/wellknown.yml b/tasks/providers/http-01/wellknown.yml index 237f413..d7bd0fe 100644 --- a/tasks/providers/http-01/wellknown.yml +++ b/tasks/providers/http-01/wellknown.yml @@ -1,17 +1,7 @@ --- -# # acme_data.challenge_data => -# # "DNS NAME": { -# # "dns-01": { -# # "resource": "_acme-challenge", -# # "resource_value": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -# # }, -# # "http-01": { -# # "resource": ".well-known/acme-challenge/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", -# # "resource_value": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.yyyyyyyy-yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy" -# # } -# # }, +## Creating & adding the well-known acme-challenge file with data -- name: Copy HTTP well-know ACME Challege data to file +- name: Copy HTTP well-known ACME Challege data to file copy: content: "{{ acme_data.challenge_data[lets_encrypt_resource_domain]['http-01']['resource_value'] }}" dest: "{{ lets_encrypt_http_path }}/{{ acme_data.challenge_data[lets_encrypt_resource_domain]['http-01']['resource'] }}" diff --git a/tasks/wellknow.yml b/tasks/wellknown.yml similarity index 100% rename from tasks/wellknow.yml rename to tasks/wellknown.yml