File tree Expand file tree Collapse file tree 2 files changed +12
-5
lines changed
Expand file tree Collapse file tree 2 files changed +12
-5
lines changed Original file line number Diff line number Diff 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]
203203confdir = /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
204208EOF
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
207215RUN 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"; \
Original file line number Diff line number Diff line change 22
33set -e
44
5+ puppet config set confdir /etc/puppetlabs/puppet
56puppet config set vardir /opt/puppetlabs/puppet/cache
67puppet config set logdir /var/log/puppetlabs/puppet
78puppet config set codedir /etc/puppetlabs/code
You can’t perform that action at this time.
0 commit comments