From 1fba55929e36bd2773468edbb5b9c2a05add1178 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 1 Jul 2022 17:00:17 +0200 Subject: [PATCH] Update to 2022-07-01 17:00 --- roles/letsencrypt/defaults/main.yml | 40 ++++++++++------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/roles/letsencrypt/defaults/main.yml b/roles/letsencrypt/defaults/main.yml index 705acbe..cf0c34e 100644 --- a/roles/letsencrypt/defaults/main.yml +++ b/roles/letsencrypt/defaults/main.yml @@ -41,34 +41,20 @@ letsencrypt_certs: [] # RENEW_DAYS: 20 # KEYSIZE: 3072 +letsencrypt_empty_hook: | + #!/bin/bash -e + # Managed by ansible, manual modifications will be lost + exit 0 letsencrypt_base_hooks: - clean_challenge: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost - deploy_cert: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost - deploy_challenge: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost - exit_hook: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost - generate_csr: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost - invalid_challenge: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost - request_failure: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost - startup_hook: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost - unchanged_cert: | - #!/bin/bash -e - # Managed by ansible, manual modifications will be lost + clean_challenge: "{{ letsencrypt_empty_hook }}" + deploy_cert: "{{ letsencrypt_empty_hook }}" + deploy_challenge: "{{ letsencrypt_empty_hook }}" + exit_hook: "{{ letsencrypt_empty_hook }}" + generate_csr: "{{ letsencrypt_empty_hook }}" + invalid_challenge: "{{ letsencrypt_empty_hook }}" + request_failure: "{{ letsencrypt_empty_hook }}" + startup_hook: "{{ letsencrypt_empty_hook }}" + unchanged_cert: "{{ letsencrypt_empty_hook }}" letsencrypt_extra_hooks: {} letsencrypt_hooks: "{{ letsencrypt_base_hooks | combine(letsencrypt_extra_hooks, recursive=True) }}"