Merge pull request #104 from voxpupuli/fix_certificate_allow_list

only set certificate-allowlist if configured
voxpupuli · Feb 4, 2025 · c5387eb · c5387eb
2 parents e072b8d + d959c85
commit c5387eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/puppetdb/conf.d/puppetdb.conf b/puppetdb/conf.d/puppetdb.conf
@@ -1,4 +1,3 @@
 puppetdb: {
   disable-update-checking: 'true'
-  certificate-allowlist: certificate-allowlist
 }
diff --git a/puppetdb/docker-entrypoint.d/30-certificate-allowlist.sh b/puppetdb/docker-entrypoint.d/30-certificate-allowlist.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
 
+hocon() {
+  /opt/puppetlabs/puppet/lib/ruby/vendor_gems/bin/hocon "$@"
+}
+
 if [ "$PUPPETDB_CERTIFICATE_ALLOWLIST" != "" ]; then
+  hocon -f /etc/puppetlabs/puppetdb/conf.d/puppetdb.conf set puppetdb.certificate-allowlist certificate-allowlist
   IFS=','
   for cert in $PUPPETDB_CERTIFICATE_ALLOWLIST; do
     echo $cert >> /opt/puppetlabs/server/apps/puppetdb/certificate-allowlist
   done
-else
-  touch /opt/puppetlabs/server/apps/puppetdb/certificate-allowlist
 fi