From 6e95657ce422d1f8d32c683aa31b9b3c5597aeba Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 20 Aug 2026 13:22:12 +0200
Subject: [PATCH 1/2] modulesync 2026-08-20

---
 Gemfile                        | 17 ++++++++---------
 Rakefile                       |  6 +-----
 spec/spec_helper_acceptance.rb |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index c97c2104..d0903345 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,16 +3,15 @@
 
 source 'https://rubygems.org'
 
-gem 'puppet', ENV.fetch('PUPPET_GEM_VERSION', '>= 7'), groups: ['development', 'test']
+gem 'openvox', ENV.fetch('PUPPET_GEM_VERSION', '>= 8'), groups: ['development', 'test']
 gem 'rake'
 
-gem 'kafo_module_lint', {"groups"=>["test"]}
-gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
-gem 'voxpupuli-test', '~> 9.0', {"groups"=>["test"]}
-gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
-gem 'puppet_metadata', '~> 5.3'
-gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 4.1', {"groups"=>["system_tests"]}
-gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
+gem 'kafo_module_lint', {"groups" => ["test"]}
+gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 2.0', {"groups" => ["test"]}
+gem 'voxpupuli-test', '~> 14.0', {"groups" => ["test"]}
+gem 'github_changelog_generator', '>= 1.15.0', {"groups" => ["development"]}
+gem 'puppet_metadata', '~> 6.3'
+gem 'puppet-blacksmith', '~> 9.1', {"groups" => ["development"]}
+gem 'voxpupuli-acceptance', '~> 4.4', {"groups" => ["system_tests"]}
 
 # vim:ft=ruby
diff --git a/Rakefile b/Rakefile
index c182b84b..106b6a3f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,10 +6,6 @@
 begin
   require 'voxpupuli/test/rake'
 rescue LoadError
-  begin
-    require 'puppetlabs_spec_helper/rake_tasks'
-  rescue LoadError
-  end
 end
 
 # load optional tasks for acceptance
@@ -19,7 +15,7 @@ begin
 rescue LoadError
 else
   # We use fixtures in our modules, which is not the default
-  task :beaker => 'spec_prep'
+  task :beaker => 'fixtures:prep'
 end
 
 # blacksmith isn't always present, e.g. on Travis with --without development
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index bdf14c44..54bb9013 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,6 +1,6 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-ENV['BEAKER_setfile'] ||= 'centos8-64{hostname=centos8-64.example.com}'
+ENV['BEAKER_setfile'] ||= 'centos9-64{hostname=centos9-64.example.com}'
 
 configure_beaker(modules: :fixtures) do |host|
   if fact_on(host, 'os.family') == 'RedHat'

From 4b73e40cb83032d5e3a5b1582dd4b852c6b15697 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 20 Aug 2026 13:37:16 +0200
Subject: [PATCH 2/2] puppet-lint: autofix

---
 manifests/apache.pp     | 10 +++++-----
 manifests/config.pp     |  4 ++--
 manifests/plugin/rpm.pp |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifests/apache.pp b/manifests/apache.pp
index fc930c71..379fe13c 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -102,7 +102,7 @@
     default: {
       $http_vhost_name = $pulpcore::apache_http_vhost
       $http_fragment = epp('pulpcore/apache-fragment.epp', {
-          'directories' => [$content_directory],
+        'directories' => [$content_directory],
       })
     }
   }
@@ -140,8 +140,8 @@
     default: {
       $https_vhost_name = $pulpcore::apache_https_vhost
       $https_fragment = epp('pulpcore/apache-fragment.epp', {
-          'directories' => [$content_directory, $api_directory],
-          'proxy_pass'  => [$proxy_pass_static],
+        'directories' => [$content_directory, $api_directory],
+        'proxy_pass'  => [$proxy_pass_static],
       })
     }
   }
@@ -167,8 +167,8 @@
     # then conflict with the foreman module which doesn't use the selinux module.
     if $facts['os']['selinux']['enabled'] {
       ensure_resource('selboolean', 'httpd_can_network_connect', {
-          value      => 'on',
-          persistent => true,
+        value      => 'on',
+        persistent => true,
       })
     }
   }
diff --git a/manifests/config.pp b/manifests/config.pp
index 59d9857e..88aeb4fa 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -42,8 +42,8 @@
   concat::fragment { 'logging':
     target  => 'pulpcore settings',
     content => epp('pulpcore/settings-logging.py.epp', {
-        'level'   => $pulpcore::log_level,
-        'loggers' => $loggers,
+      'level'   => $pulpcore::log_level,
+      'loggers' => $loggers,
     }),
     order   => '02',
   }
diff --git a/manifests/plugin/rpm.pp b/manifests/plugin/rpm.pp
index 603c1218..a4863fe8 100644
--- a/manifests/plugin/rpm.pp
+++ b/manifests/plugin/rpm.pp
@@ -41,8 +41,8 @@
 
   if $keep_changelog_limit or $allow_automatic_unsafe_advisory_conflict_resolution {
     $rpm_plugin_config = epp('pulpcore/settings-rpm.py.epp', {
-        'allow_auacr'          => $allow_automatic_unsafe_advisory_conflict_resolution,
-        'keep_changelog_limit' => $keep_changelog_limit,
+      'allow_auacr'          => $allow_automatic_unsafe_advisory_conflict_resolution,
+      'keep_changelog_limit' => $keep_changelog_limit,
     })
   } else {
     $rpm_plugin_config = undef