Skip to content

Commit 345634a

Browse files
pavelkovtunovbastelfreak
authored andcommitted
fix: remove nokey option and set empty passwords
1 parent b4f2682 commit 345634a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

manifests/export/pem_key.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626
) {
2727
if $ensure == 'present' {
2828
if $in_pass {
29-
$passin_opt = ['-nokeys', '-passin', 'env:CERTIFICATE_PASSIN']
29+
$passin_opt = ['-passin', 'env:CERTIFICATE_PASSIN']
3030
$passin_env = ["CERTIFICATE_PASSIN=${in_pass}"]
3131
} else {
32-
$passin_opt = []
32+
$passin_opt = ['-passin', 'pass:']
3333
$passin_env = []
3434
}
3535

3636
if $out_pass {
37-
$passout_opt = ['-nokeys', '-passout', 'env:CERTIFICATE_PASSOUT']
37+
$passout_opt = ['-passout', 'env:CERTIFICATE_PASSOUT']
3838
$passout_env = ["CERTIFICATE_PASSOUT=${out_pass}"]
3939
} else {
40-
$passout_opt = []
40+
$passout_opt = ['-nodes']
4141
$passout_env = []
4242
}
4343

manifests/export/pkcs12.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@
3434

3535
if $ensure == 'present' {
3636
if $in_pass {
37-
$passin_opt = ['-nokeys', '-passin', 'env:CERTIFICATE_PASSIN']
37+
$passin_opt = ['-passin', 'env:CERTIFICATE_PASSIN']
3838
$passin_env = ["CERTIFICATE_PASSIN=${in_pass}"]
3939
} else {
40-
$passin_opt = []
40+
$passin_opt = ['-passin', 'pass:']
4141
$passin_env = []
4242
}
4343

4444
if $out_pass {
45-
$passout_opt = ['-nokeys', '-passout', 'env:CERTIFICATE_PASSOUT']
45+
$passout_opt = ['-passout', 'env:CERTIFICATE_PASSOUT']
4646
$passout_env = ["CERTIFICATE_PASSOUT=${out_pass}"]
4747
} else {
48-
$passout_opt = []
48+
$passout_opt = ['-passout', 'pass:']
4949
$passout_env = []
5050
}
5151

0 commit comments

Comments
 (0)