From ab078ca1ccc49719129ff4b91f8d3ac9740d3a73 Mon Sep 17 00:00:00 2001 From: Ruben Bosch Date: Fri, 13 Mar 2020 19:21:46 +0100 Subject: [PATCH] Fixes #374 - Revocation command update and crl renew An issue was raised informing that the revocation command is incorrect. This was diagnosed to indeed be the case. The exec for the crl renew was updated to clarify which server it's done for. --- manifests/revoke.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/revoke.pp b/manifests/revoke.pp index 910cbc6d..642e6ca7 100644 --- a/manifests/revoke.pp +++ b/manifests/revoke.pp @@ -27,7 +27,7 @@ $revocation_command = $openvpn::easyrsa_version ? { '2.0' => ". ./vars && ./revoke-full ${name}; echo \"exit $?\" | grep -qE '(error 23|exit (0|2))' && touch revoked/${name}", - '3.0' => ". ./vars && ./easyrsa revoke --batch ${name}; echo \"exit $?\" | grep -qE '(error 23|exit (0|2))' && touch revoked/${name}", + '3.0' => ". ./vars && ./easyrsa --batch revoke ${name}; echo \"exit $?\" | grep -qE '(error 23|exit (0|2))' && touch revoked/${name}", } $renew_command = $openvpn::easyrsa_version ? { @@ -41,13 +41,13 @@ cwd => "${server_directory}/${server}/easy-rsa", creates => "${server_directory}/${server}/easy-rsa/revoked/${name}", provider => 'shell', - notify => Exec["renew crl.pem on ${name}"], + notify => Exec["renew crl.pem on ${server} in context of ${name}"], } - exec { "renew crl.pem on ${name}": + exec { "renew crl.pem on ${server} in context of ${name}": command => $renew_command, cwd => "${openvpn::server_directory}/${name}/easy-rsa", provider => 'shell', - schedule => "renew crl.pem schedule on ${name}", + schedule => "renew crl.pem schedule on ${server}", } }