Skip to content

Commit

Permalink
Migrate from certbot-auto to certbot
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed May 2, 2021
1 parent 344183e commit 904dccd
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ letsencrypt::certonly { 'foo':

#### Additional arguments

If you need to pass a command line flag to the `letsencrypt-auto` command that
If you need to pass a command line flag to the `letsencrypt` command that
is not supported natively by this module, you can use the `additional_args`
parameter to pass those arguments:

Expand Down
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ Default value: `$letsencrypt::command`

Data type: `Array[String[1]]`

An array of additional command line arguments to pass to the `letsencrypt-auto` command.
An array of additional command line arguments to pass to the `letsencrypt` command.

Default value: `[]`

Expand Down
2 changes: 1 addition & 1 deletion manifests/certonly.pp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# `webroot_paths` are not the same length, the last `webroot_paths`
# element will be used for all subsequent domains.
# @param letsencrypt_command Command to run letsencrypt
# @param additional_args An array of additional command line arguments to pass to the `letsencrypt-auto` command.
# @param additional_args An array of additional command line arguments to pass to the `letsencrypt` command.
# @param environment An optional array of environment variables (in addition to VENV_PATH).
# @param key_size Size for the RSA public key
# @param manage_cron
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

$command_init = $install_method ? {
'package' => $package_command,
'vcs' => "${path}/letsencrypt-auto",
'vcs' => "${path}/letsencrypt",
}

if $manage_config {
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/letsencrypt_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
let(:additional_params) { { path: '/usr/lib/letsencrypt', install_method: 'vcs' } }

it { is_expected.to contain_class('letsencrypt::install').with_path('/usr/lib/letsencrypt') }
it { is_expected.to contain_exec('initialize letsencrypt').with_command('/usr/lib/letsencrypt/letsencrypt-auto -h') }
it { is_expected.to contain_exec('initialize letsencrypt').with_command('/usr/lib/letsencrypt/letsencrypt -h') }
end

describe 'with custom environment variables' do
Expand Down Expand Up @@ -169,7 +169,7 @@
let(:additional_params) { { install_method: 'vcs' } }

it { is_expected.to contain_class('letsencrypt::install').with_install_method('vcs') }
it { is_expected.to contain_exec('initialize letsencrypt').with_command('/opt/letsencrypt/letsencrypt-auto -h') }
it { is_expected.to contain_exec('initialize letsencrypt').with_command('/opt/letsencrypt/letsencrypt -h') }
end

describe 'with custom config directory' do
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/letsencrypt_certonly_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@

context 'with custom command' do
let(:title) { 'foo.example.com' }
let(:params) { { letsencrypt_command: '/usr/lib/letsencrypt/letsencrypt-auto' } }
let(:params) { { letsencrypt_command: '/usr/lib/letsencrypt/letsencrypt' } }

it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_exec('letsencrypt certonly foo.example.com').with_command '/usr/lib/letsencrypt/letsencrypt-auto --text --agree-tos --non-interactive certonly --rsa-key-size 4096 -a standalone --cert-name \'foo.example.com\' -d \'foo.example.com\'' }
it { is_expected.to contain_exec('letsencrypt certonly foo.example.com').with_command '/usr/lib/letsencrypt/letsencrypt --text --agree-tos --non-interactive certonly --rsa-key-size 4096 -a standalone --cert-name \'foo.example.com\' -d \'foo.example.com\'' }
end

context 'with webroot plugin' do
Expand Down

0 comments on commit 904dccd

Please sign in to comment.