From 1bd955249ce27325cbcff1913b78a284b8e075c8 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Tue, 18 Aug 2026 17:59:22 +0000 Subject: [PATCH] [puppetsync] Re-assert the refreshed pupmod baseline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch re-asserts the puppetsync-managed baseline files after reconciling the templates with the deployed fleet (the templates now describe the OpenVox-era reality — voxpupuli-test spec_helper, current dotfiles): - spec/spec_helper.rb: normalized to the fleet-majority variant - .puppet-lint.rc: disable the strict_indent check fleet-wide (puppet-lint-strict_indent-check 5.0.0 crashes on some valid manifests; 16 repos already carried this workaround) - .gitignore/.pdkignore/.gitattributes/.rspec: majority variants Gemfiles and workflow files are bootstrap-strategy and are not touched by this sync (Renovate manages their versions in place). --- .gitignore | 5 ++++- .puppet-lint.rc | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b0e858f..bff5942 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,9 @@ dist /pkg # Read everything in fixtures /spec/fixtures/* -# Un-ignore hieradata +# Un-ignore hieradata. The directory itself must be re-included first, otherwise +# `/spec/fixtures/*` above excludes it and git cannot re-include files within it. +!/spec/fixtures/hieradata/ !/spec/fixtures/hieradata/* # Except this one, which is auto-generated /spec/fixtures/hieradata/hiera.yaml @@ -25,6 +27,7 @@ dist /log /doc /Gemfile.lock +/Gemfile.local ## AI coding assistant-specific configuration ## The standard is AGENTS.md diff --git a/.puppet-lint.rc b/.puppet-lint.rc index eb56769..16eb616 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -13,3 +13,6 @@ # This is here because the code can't handle lookups in parameters and SIMP # modules have a LOT of those --no-parameter_order-check +# puppet-lint-strict_indent-check 5.0.0 crashes on some valid manifests +# (remove when the plugin is fixed upstream) +--no-strict_indent-check