Skip to content

Commit 6547d90

Browse files
committed
fix: config not properly synced
1 parent 9e73538 commit 6547d90

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

openvoxserver/Containerfile.alpine

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,20 +197,26 @@ ENV HOME=${data_dir}/puppetserver
197197
# use system confdir to make it easier to manage permissions and paths
198198
# the conf in that dir should also contain other dirs that are being used for interpolation
199199
# 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'
200+
RUN mkdir -p ${HOME}/.puppetlabs/var && \
201+
cat > /etc/puppetlabs/puppet/puppet.conf <<'EOF'
202202
[main]
203203
confdir = /etc/puppetlabs/puppet/
204+
vardir = /opt/puppetlabs/puppet/cache
205+
logdir = /var/log/puppetlabs/puppet
206+
codedir = /etc/puppetlabs/code
207+
rundir = /var/run/puppetlabs
204208
EOF
209+
RUN ln -sf /etc/puppetlabs ${HOME}/.puppetlabs/etc \
210+
&& ln -sf /opt/puppetlabs ${HOME}/.puppetlabs/opt \
211+
&& ln -sf /var/log/puppetlabs ${HOME}/.puppetlabs/var/log \
212+
&& ln -sf /var/run/puppetlabs ${HOME}/.puppetlabs/var/run
205213

206214
# mirror user permissions to group, set group to root, and set gid bit on dirs
207215
RUN for d in \
208216
/etc/puppetlabs \
209217
/var/log/puppetlabs \
210218
/var/run/puppetlabs \
211-
/opt/puppetlabs/var \
212-
/opt/puppetlabs/cache \
213-
${data_dir} \
219+
/opt/puppetlabs/ \
214220
; do \
215221
mkdir -p "$d"; \
216222
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)