From 93c731e43853d225a00d119915a73f6108a2aa2c Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Tue, 9 Feb 2021 22:08:55 +0100 Subject: [PATCH 1/2] Fix ocsp filename --- templates/usr/local/bin/haproxy-letsencrypt-ocsp-deploy.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/usr/local/bin/haproxy-letsencrypt-ocsp-deploy.j2 b/templates/usr/local/bin/haproxy-letsencrypt-ocsp-deploy.j2 index 98730664..52c6571e 100644 --- a/templates/usr/local/bin/haproxy-letsencrypt-ocsp-deploy.j2 +++ b/templates/usr/local/bin/haproxy-letsencrypt-ocsp-deploy.j2 @@ -22,13 +22,13 @@ for path in $(ls -1d {{ haproxy_letsencrypt_ssl_src_path }}/*/); do ocspUrl="$(openssl x509 -noout -ocsp_uri -in ${path}{{ haproxy_letsencrypt_ssl_cert_name }})"; - openssl ocsp -no_nonce -respout "{{ haproxy_global_crt_base }}/${prefix}-${cert}.ocsp" \ + openssl ocsp -no_nonce -respout "{{ haproxy_global_crt_base }}/${prefix}-${cert}.pem.ocsp" \ -issuer "${path}{{ haproxy_letsencrypt_ssl_chain_name }}" \ -verify_other "${path}{{ haproxy_letsencrypt_ssl_chain_name }}" \ -cert "${path}{{ haproxy_letsencrypt_ssl_cert_name }}" \ -url "${ocspUrl}"; - rm -f "{{ haproxy_global_crt_base }}/${removePrefix}-${cert}.ocsp"; + rm -f "{{ haproxy_global_crt_base }}/${removePrefix}-${cert}.pem.ocsp"; done {% if ansible_service_mgr == 'systemd' %} From 80ceb51f37f842b8478e016a6c1f3f0b7a9fac89 Mon Sep 17 00:00:00 2001 From: Mark van Driel Date: Wed, 10 Feb 2021 15:23:26 +0100 Subject: [PATCH 2/2] Fix linter --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16376346..dc23c831 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: python-version: '3.x' - name: Install test dependencies - run: pip install yamllint ansible-lint + run: pip install yamllint ansible-lint[core] - name: Lint code run: |