Skip to content

Commit

Permalink
Fix #116
Browse files Browse the repository at this point in the history
  • Loading branch information
sbjzn committed Aug 30, 2024
1 parent 2310dfd commit d40fb9e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion puppetserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ENV PUPPETSERVER_JAVA_ARGS="-Xms1024m -Xmx1024m" \
CA_PORT=8140 \
CA_ALLOW_SUBJECT_ALT_NAMES=false \
INTERMEDIATE_CA=false \
INTERMEDIATE_CA_BUNDLE=/etc/puppetlabs/intermediat/ca.pem \
INTERMEDIATE_CA_BUNDLE=/etc/puppetlabs/intermediate/ca.pem \
INTERMEDIATE_CRL_CHAIN=/etc/puppetlabs/intermediate/crl.pem \
INTERMEDIATE_CA_KEY=/etc/puppetlabs/intermediate/key.pem \
USE_PUPPETDB=true \
Expand Down
2 changes: 1 addition & 1 deletion puppetserver/docker-entrypoint.d/90-ca.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ else
hocon -f /etc/puppetlabs/puppetserver/conf.d/ca.conf \
set certificate-authority.allow-subject-alt-names "${CA_ALLOW_SUBJECT_ALT_NAMES}"

if [[ "$INTERMEDIATE_CA" != "true" ]]; then
if [[ "$INTERMEDIATE_CA" == "true" ]]; then
# sanity check
if [[ -z $INTERMEDIATE_CA_BUNDLE ]]; then
echo 'Error: When enabling intermediate ca, one MUST specify INTERMEDIATE_CA_BUNDLE'
Expand Down

0 comments on commit d40fb9e

Please sign in to comment.