Merge pull request #117 from sbjzn/main

Fix: update if-statement causing wrong behavior and fix typo introduce in #116
voxpupuli · Sep 1, 2024 · c31119f · c31119f
2 parents 2310dfd + d40fb9e
commit c31119f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/puppetserver/Dockerfile b/puppetserver/Dockerfile
@@ -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 \

diff --git a/puppetserver/docker-entrypoint.d/90-ca.sh b/puppetserver/docker-entrypoint.d/90-ca.sh
@@ -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'