Merge pull request voxpupuli#98 from tuxmea/fix_allow_list

rwaffen · web-flow · commit 6e98ea3eca9c · 2025-01-23T11:11:44.000+01:00
verified within a local docker compose
diff --git a/puppetdb/conf.d/puppetdb.conf b/puppetdb/conf.d/puppetdb.conf
@@ -1,4 +1,4 @@
 puppetdb: {
   disable-update-checking: 'true'
-  certificate-allowlist: '/etc/puppetlabs/puppetdb/conf.d/certificate-allowlist'
+  certificate-allowlist: certificate-allowlist
 }
diff --git a/puppetdb/docker-entrypoint.d/30-certificate-allowlist.sh b/puppetdb/docker-entrypoint.d/30-certificate-allowlist.sh
@@ -3,9 +3,9 @@
 if [ "$PUPPETDB_CERTIFICATE_ALLOWLIST" != "" ]; then
   IFS=','
   for cert in $PUPPETDB_CERTIFICATE_ALLOWLIST; do
-    echo $cert >> /etc/puppetlabs/puppetdb/conf.d/certificate-allowlist
+    echo $cert >> /opt/puppetlabs/server/apps/puppetdb/certificate-allowlist
   done
 else
-  touch /etc/puppetlabs/puppetdb/conf.d/certificate-allowlist
+  touch /opt/puppetlabs/server/apps/puppetdb/certificate-allowlist
 fi
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`puppetdb: {`
`2`	`2`	`disable-update-checking: 'true'`
`3`		`- certificate-allowlist: '/etc/puppetlabs/puppetdb/conf.d/certificate-allowlist'`
	`3`	`+ certificate-allowlist: certificate-allowlist`
`4`	`4`	`}`