From 52211d86cec384957ecdd3cd675c68a84913b1cd Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 7 Aug 2019 19:08:51 +0200 Subject: [PATCH] acmetool: pass the correct hooks directory from the command line. Fixes https://redmine-s2i2s.isti.cnr.it/issues/16 --- .../centos/roles/letsencrypt-acmetool-client/defaults/main.yml | 2 +- library/roles/letsencrypt-acmetool-client/defaults/main.yml | 2 +- library/roles/letsencrypt-acmetool-client/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/centos/roles/letsencrypt-acmetool-client/defaults/main.yml b/library/centos/roles/letsencrypt-acmetool-client/defaults/main.yml index 2a82634..3468ea2 100644 --- a/library/centos/roles/letsencrypt-acmetool-client/defaults/main.yml +++ b/library/centos/roles/letsencrypt-acmetool-client/defaults/main.yml @@ -12,7 +12,7 @@ letsencrypt_acme_user_home: /var/lib/acme letsencrypt_acme_log_dir: /var/log/acme letsencrypt_acme_command: acmetool -letsencrypt_acme_command_opts: '--batch --xlog.syslog --xlog.severity=info' +letsencrypt_acme_command_opts: '--hooks={{ letsencrypt_acme_services_scripts_dir }} --batch --xlog.syslog --xlog.severity=INFO --xlog.file="{{ letsencrypt_acme_log_dir }}/certrequest.log" --xlog.fileseverity=TRACE' letsencrypt_acme_config_dir: '{{ letsencrypt_acme_user_home }}/conf' letsencrypt_acme_certsconf_dir: '{{ letsencrypt_acme_user_home }}/desired' letsencrypt_acme_certs_dir: '{{ letsencrypt_acme_user_home }}/live/{{ ansible_fqdn }}' diff --git a/library/roles/letsencrypt-acmetool-client/defaults/main.yml b/library/roles/letsencrypt-acmetool-client/defaults/main.yml index 9a95a9b..0ebd556 100644 --- a/library/roles/letsencrypt-acmetool-client/defaults/main.yml +++ b/library/roles/letsencrypt-acmetool-client/defaults/main.yml @@ -14,7 +14,7 @@ letsencrypt_acme_user_home: /var/lib/acme letsencrypt_acme_log_dir: /var/log/acme letsencrypt_acme_command: acmetool -letsencrypt_acme_command_opts: '--batch --xlog.syslog --xlog.syslogseverity=INFO --xlog.file="{{ letsencrypt_acme_log_dir }}/certrequest.log" --xlog.fileseverity=TRACE' +letsencrypt_acme_command_opts: '--hooks={{ letsencrypt_acme_services_scripts_dir }} --batch --xlog.syslog --xlog.syslogseverity=INFO --xlog.file="{{ letsencrypt_acme_log_dir }}/certrequest.log" --xlog.fileseverity=TRACE' letsencrypt_acme_config_dir: '{{ letsencrypt_acme_user_home }}/conf' letsencrypt_acme_certsconf_dir: '{{ letsencrypt_acme_user_home }}/desired' letsencrypt_acme_dest_dir: '{{ ansible_fqdn }}' diff --git a/library/roles/letsencrypt-acmetool-client/tasks/main.yml b/library/roles/letsencrypt-acmetool-client/tasks/main.yml index d114f97..040b2dd 100644 --- a/library/roles/letsencrypt-acmetool-client/tasks/main.yml +++ b/library/roles/letsencrypt-acmetool-client/tasks/main.yml @@ -109,7 +109,7 @@ - name: Install a script that requests the certificates and manage the self signed certificate template: src=acme-cert-request.sh.j2 dest=/usr/local/bin/acme-cert-request owner=root group=root mode=0755 when: letsencrypt_acme_install - tags: [ 'letsencrypt', 'letsencrypt_cron' ] + tags: [ 'letsencrypt', 'letsencrypt_cron', 'letsencrypt_hook' ] - name: Set certificates as to be revoked become: True