Merge pull request #44 from tuxmea/additional_configs

Add additional parameters, rework entrypoint order
voxpupuli · Jan 5, 2024 · 43f6122 · 43f6122
2 parents 254b045 + 739cee8
commit 43f6122
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -89,6 +89,8 @@ The following environment variables are supported:
 | **PUPPETSERVER_GRAPHITE_PORT**             | Only used if **PUPPETSERVER_GRAPHITE_EXPORTER_ENABLED** is set to `true`. Port of the graphite server where puppet should push metrics to. <br><br> Default to `9109` |
 | **PUPPETSERVER_ENVIRONMENT_TIMEOUT**       | Configure the environment timeout<br><br> Defaults to `unlimited`                                                                                             |
 | **PUPPETSERVER_ENABLE_ENV_CACHE_DEL_API**  | Enable the puppet admin api endpoint via certificates to allow clearing environment caches<br><br> Defaults to `true`                                         |
+| **ENVIRONMENTPATH**                        | Set an environmentpath<br><br> Defaults to `/etc/puppetlabs/code/environments`                                                                                |
+| **HIERACONFIG**                            | Set a hiera_config entry in puppet.conf file<br><br> Defaults to `$confdir/hiera.yaml`                                                                        |
 
 ## Initialization Scripts
 

diff --git a/puppetserver/Dockerfile b/puppetserver/Dockerfile
@@ -42,7 +42,9 @@ ENV PUPPETSERVER_JAVA_ARGS="-Xms1024m -Xmx1024m" \
     PUPPETSERVER_GRAPHITE_PORT=9109 \
     PUPPETSERVER_GRAPHITE_HOST=exporter \
     PUPPETSERVER_ENVIRONMENT_TIMEOUT=unlimited \
-    PUPPETSERVER_ENABLE_ENV_CACHE_DEL_API=true
+    PUPPETSERVER_ENABLE_ENV_CACHE_DEL_API=true \
+    ENVIRONMENTPATH=/etc/puppetlabs/code/environments \
+    HIERACONFIG="$confdir/hiera.yaml"
 
 # NOTE: this is just documentation on defaults
 EXPOSE 8140

diff --git a/puppetserver/docker-entrypoint.d/56-set-environmentpath.sh b/puppetserver/docker-entrypoint.d/56-set-environmentpath.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+#
+puppet config set --section server environmentpath $ENVIRONMENTPATH
+
diff --git a/puppetserver/docker-entrypoint.d/57-set-hiera_config.sh b/puppetserver/docker-entrypoint.d/57-set-hiera_config.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+#
+puppet config set --section server hiera_config $HIERACONFIG
+
diff --git a/puppetserver/docker-entrypoint.d/88-enable-cache-delete-api.sh b/puppetserver/docker-entrypoint.d/88-enable-cache-delete-api.sh
diff --git a/puppetserver/docker-entrypoint.d/80-ca.sh → puppetserver/docker-entrypoint.d/90-ca.sh b/puppetserver/docker-entrypoint.d/80-ca.sh → puppetserver/docker-entrypoint.d/90-ca.sh
diff --git a/...rver/docker-entrypoint.d/90-log-config.sh → ...rver/docker-entrypoint.d/99-log-config.sh b/...rver/docker-entrypoint.d/90-log-config.sh → ...rver/docker-entrypoint.d/99-log-config.sh