Move encapic config to /etc/encapi and pin encapic 0.4.0
ci/woodpecker/pr/bolt-validate Pipeline was successful
ci/woodpecker/pr/puppet-lint Pipeline was successful
ci/woodpecker/pr/erb-validate Pipeline was successful
ci/woodpecker/pr/epp-validate Pipeline was successful
ci/woodpecker/pr/yamllint Pipeline was successful
ci/woodpecker/pr/ruby-validate Pipeline was successful
ci/woodpecker/pr/puppet-validate Pipeline was successful
ci/woodpecker/pr/ruby-check Pipeline was successful

This commit is contained in:
2026-11-08 21:55:10 +11:00
parent 8e2497d612
commit 4bd86c45e9
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ profiles::puppet::enc::repo: https://git.service.au-syd1.consul/unkinben/puppet-
# Deep-merged with the entries in roles/infra/puppet.yaml.
profiles::packages::include:
encapic:
ensure: '0.2.0'
ensure: '0.4.0'
certmanager:
ensure: '0.2.0'
sshsignhost:
+3 -3
View File
@@ -5,14 +5,14 @@
# config so the encapi endpoint can change without repackaging.
class profiles::puppet::encapic (
Stdlib::HTTPUrl $encapi_url,
Stdlib::AbsolutePath $config_dir = '/etc/encapic',
Stdlib::AbsolutePath $config_dir = '/etc/encapi',
String $config_name = 'encapic.conf',
String $owner = 'root',
String $group = 'root',
) {
# The RPM ships this file as %config(noreplace), so puppet must write it only
# once the package is present or the install overwrites it.
# encapic >= 0.4.0 reads this path ahead of the RPM-owned /etc/encapic one;
# order after the package so the shim exists before the config does.
file { $config_dir:
ensure => directory,
mode => '0755',