Merge pull request #35 from tuxmea/idempotent_admin_api

Make setting for admin-api idempotent
voxpupuli · Dec 14, 2023 · ab9e883 · ab9e883
2 parents e3f96d8 + 2022a7d
commit ab9e883
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/puppetserver/docker-entrypoint.d/88-enable-cache-delete-api.sh b/puppetserver/docker-entrypoint.d/88-enable-cache-delete-api.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 #
 if [[ "$PUPPETSERVER_ENABLE_ENV_CACHE_DEL_API" == true ]]; then
-  /opt/puppetlabs/puppet/bin/ruby /add_cache_del_api_auth_rules.rb
+  if [ $(grep 'puppet-admin-api' /etc/puppetlabs/puppetserver/conf.d/auth.conf) ]; then
+    echo "Admin API already set"
+  else
+    /opt/puppetlabs/puppet/bin/ruby /add_cache_del_api_auth_rules.rb
+  fi
 fi