Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ENC / reports capability #79

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ The following environment variables are supported:
| **CA_ALLOW_SUBJECT_ALT_NAMES** | Whether or not SSL certificates containing Subject Alternative Names should be signed by the CA. Does nothing unless `CA_ENABLED=true`.<br><br>`false` |
| **PUPPET_REPORTS** | Sets `reports` in puppet.conf<br><br>`puppetdb` |
| **PUPPET_STORECONFIGS** | Sets `storeconfigs` in puppet.conf<br><br>`true` |
| **PUPPET_NODE_TERMINUS** | Sets `node_terminus` in puppet.conf<br><br>Defaults to unset. |
| **PUPPET_EXTERNAL_NODES** | Sets `external_nodes` in puppet.conf<br><br>Defaults to unset. |
rwaffen marked this conversation as resolved.
Show resolved Hide resolved
| **PUPPET_STORECONFIGS_BACKEND** | Sets `storeconfigs_backend` in puppet.conf<br><br>`puppetdb` |
| **PUPPETSERVER_MAX_ACTIVE_INSTANCES** | The maximum number of JRuby instances allowed<br><br>`1` |
| **PUPPETSERVER_MAX_REQUESTS_PER_INSTANCE** | The maximum HTTP requests a JRuby instance will handle in its lifetime (disable instance flushing)<br><br>`0` |
Expand Down
5 changes: 5 additions & 0 deletions puppetserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@ COPY conf.d/product.conf /etc/puppetlabs/puppetserver/conf.d/

COPY puppetdb.conf /var/tmp/puppet/

COPY enc/* /etc/puppetlabs/puppet
COPY reports/* /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/reports
RUN chmod +x /etc/puppetlabs/puppet/*.rb && \
chmod +x /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/reports/*.rb
rwaffen marked this conversation as resolved.
Show resolved Hide resolved

LABEL org.label-schema.name="Puppet Server ($build_type)" \
org.label-schema.version="$PUPPETSERVER_VERSION" \
org.label-schema.vcs-ref="$vcs_ref" \
Expand Down
9 changes: 9 additions & 0 deletions puppetserver/docker-entrypoint.d/86-setup-enc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

if [ -n "$PUPPET_NODE_TERMINUS" ]; then
puppet config set node_terminus $PUPPET_NODE_TERMINUS --section master
rwaffen marked this conversation as resolved.
Show resolved Hide resolved
fi

if [ -n "$PUPPET_EXTERNAL_NODES" ]; then
puppet config set external_nodes $PUPPET_EXTERNAL_NODES --section master
rwaffen marked this conversation as resolved.
Show resolved Hide resolved
fi
Loading