Skip to content

Commit

Permalink
Fixes voxpupuli#374 - Revocation command update and crl renew
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ruben Bosch committed Mar 13, 2020
1 parent 73725c6 commit ab078ca
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions manifests/revoke.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ? {
Expand All @@ -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}",
}
}

0 comments on commit ab078ca

Please sign in to comment.