Skip to content

Commit 0f4638f

Browse files
committed
fix: config not properly synced
1 parent 9e73538 commit 0f4638f

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

openvoxserver/Containerfile.alpine

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,23 +194,22 @@ RUN apk update \
194194
# explicitly set HOME: random UIDs will cause HOME to be "/" generally
195195
ENV HOME=${data_dir}/puppetserver
196196

197-
# use system confdir to make it easier to manage permissions and paths
198-
# the conf in that dir should also contain other dirs that are being used for interpolation
199-
# to make sure we use the same dirs as if the server was started as root
200-
RUN mkdir -p ${HOME}/.puppetlabs/etc/puppet && \
201-
cat > ${HOME}/.puppetlabs/etc/puppet/puppet.conf <<'EOF'
202-
[main]
203-
confdir = /etc/puppetlabs/puppet/
204-
EOF
197+
# use system/root paths instead of non-root paths to make permission management
198+
# and volume mounting simpler. for this we link the appropiate paths and explicitly
199+
# set the base paths used for interpolation, i.e confdir, codedir, vardir, rundir and
200+
# logdir via the template and/or via `30-ensure-config.sh` in `puppet.conf`
201+
RUN mkdir -p ${HOME}/.puppetlabs/var \
202+
&& ln -sf /etc/puppetlabs ${HOME}/.puppetlabs/etc \
203+
&& ln -sf /opt/puppetlabs ${HOME}/.puppetlabs/opt \
204+
&& ln -sf /var/log/puppetlabs ${HOME}/.puppetlabs/var/log \
205+
&& ln -sf /var/run/puppetlabs ${HOME}/.puppetlabs/var/run
205206

206207
# mirror user permissions to group, set group to root, and set gid bit on dirs
207208
RUN for d in \
208209
/etc/puppetlabs \
209210
/var/log/puppetlabs \
210211
/var/run/puppetlabs \
211-
/opt/puppetlabs/var \
212-
/opt/puppetlabs/cache \
213-
${data_dir} \
212+
/opt/puppetlabs/ \
214213
; do \
215214
mkdir -p "$d"; \
216215
chgrp -R 0 "$d"; \

openvoxserver/container-entrypoint.d/30-ensure-config.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -e
44

5+
puppet config set confdir /etc/puppetlabs/puppet
56
puppet config set vardir /opt/puppetlabs/puppet/cache
67
puppet config set logdir /var/log/puppetlabs/puppet
78
puppet config set codedir /etc/puppetlabs/code

0 commit comments

Comments
 (0)