Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ fixtures:
simplib: https://github.com/simp/pupmod-simp-simplib.git
stdlib: https://github.com/simp/puppetlabs-stdlib.git
systemd: https://github.com/simp/puppet-systemd.git
symlinks:
aide: "#{source_dir}"
14 changes: 12 additions & 2 deletions .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
bundle exec rake pkg:compare_latest_tag[,true]
bundle exec rake pkg:create_tag_changelog
- name: 'Test-build the Puppet module'
run: 'bundle exec pdk build --force'
run: 'bundle exec rake pupmod:build'

spec-tests:
name: 'Puppet Spec'
Expand All @@ -95,10 +95,20 @@ jobs:
strategy:
matrix:
puppet:
- label: 'Puppet 8.x'
- label: 'OpenVox 8.x (Ruby 3.2)'
puppet_version: '~> 8.0'
ruby_version: '3.2'
experimental: false
- label: 'OpenVox 8.x (Ruby 3.4)'
puppet_version: '~> 8.0'
ruby_version: '3.4'
experimental: false
# OpenVox 9 is unreleased; preview the future Ruby 4.0 / OpenVox 9
# combo by running the OpenVox 8 gem on Ruby 4.0.
- label: 'OpenVox 9.x preview (Ruby 4.0, OpenVox 8 gem)'
puppet_version: '~> 8.0'
ruby_version: '4.0'
experimental: false
fail-fast: false
env:
PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tag_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- run: bundle exec rake pkg:create_tag_changelog
- run: bundle exec rake metadata_lint
- name: "Test that Puppet module can build"
run: "bundle exec pdk build --force"
run: "bundle exec rake pupmod:build"


create-github-release:
Expand Down Expand Up @@ -182,8 +182,8 @@ jobs:
with:
ruby-version: 3.4.9
bundler-cache: true
- name: Build Puppet module (PDK)
run: bundle exec pdk build --force
- name: Build Puppet module
run: bundle exec rake pupmod:build
- name: Deploy to Puppet Forge (skipped when prerelease)
run: |
curl -X POST --silent --show-error --fail \
Expand Down
1 change: 1 addition & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
# This is here because the code can't handle lookups in parameters and SIMP
# modules have a LOT of those
--no-parameter_order-check
--no-strict_indent-check
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Thu Jul 09 2026 Steven Pritchard <steve@sicura.us> - 9.0.1
- Resolved puppet-lint manifest whitespace offenses; disabled the crashing strict_indent check

* Tue Jun 02 2026 Mike Riddle <mike@sicura.us> - 9.0.0
- BREAKING: A bare `include aide` now installs the `aide` package only. It no
longer overwrites `/etc/aide.conf`, writes default rules, creates the
Expand Down
25 changes: 9 additions & 16 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,33 @@
# ------------------------------------------------------------------------------
gem_sources = ENV.fetch('GEM_SERVERS', 'https://rubygems.org').split(%r{[, ]+})

ENV['PDK_DISABLE_ANALYTICS'] ||= 'true'

gem_sources.each { |gem_source| source gem_source }

group :syntax do
gem 'metadata-json-lint'
gem 'puppet-lint-trailing_comma-check', require: false
gem 'rubocop', '~> 1.88.0'
# rubocop, rubocop-rake, and rubocop-rspec are pulled in and version-pinned by
# voxpupuli-test (via simp-rake-helpers); pinning them here conflicts with its
# constraints. rubocop-performance is not a voxpupuli-test dependency, so it
# stays explicit.
gem 'rubocop-performance', '~> 1.26.0'
gem 'rubocop-rake', '~> 0.7.0'
gem 'rubocop-rspec', '~> 3.10.0'
end

group :test do
puppet_version = ENV.fetch('PUPPET_VERSION', ['>= 8', '< 9'])
openvox_version = ENV.fetch('OPENVOX_VERSION', puppet_version)
major_puppet_version = Array(puppet_version).first.scan(%r{(\d+)(?:\.|\Z)}).flatten.first.to_i
gem 'hiera-puppet-helper'
# renovate: datasource=rubygems versioning=ruby
gem('pdk', ENV.fetch('PDK_VERSION', ['>= 2.0', '< 4.0']), require: false) if major_puppet_version > 5
# Temporarily include both openvox and puppet gems until the puppet dependency is removed from other gems
['openvox', 'puppet'].each do |gem_name|
gem gem_name, binding.local_variable_get("#{gem_name}_version".to_sym)
end
gem 'puppetlabs_spec_helper', '~> 8.0.0'
gem 'puppet-strings'
gem 'openvox', openvox_version
gem 'openvox-strings'
gem 'rake'
gem 'rspec'
gem 'rspec-puppet'
# renovate: datasource=rubygems versioning=ruby
gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 5.24.0')
gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 6.0')
# renovate: datasource=rubygems versioning=ruby
gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 4.0.0')
gem 'syslog', require: false
gem 'observer', require: false
end

group :development do
Expand All @@ -53,7 +46,7 @@ group :system_tests do
gem 'beaker'
gem 'beaker-rspec'
# renovate: datasource=rubygems versioning=ruby
gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 2.0.0')
gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 3.1')
end

# Evaluate extra gemfiles if they exist
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'simp/rake/pupmod/helpers'
require 'puppet-strings/tasks'
require 'openvox-strings/tasks'

Simp::Rake::Pupmod::Helpers.new(File.dirname(__FILE__))
2 changes: 1 addition & 1 deletion manifests/logrotate.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
simplib::assert_optional_dependency($module_name, 'simp/logrotate')

logrotate::rule { 'aide':
log_files => [ "${logdir}/*.log" ],
log_files => ["${logdir}/*.log"],
missingok => true,
rotate_period => $rotate_period,
rotate => $rotate_number,
Expand Down
10 changes: 5 additions & 5 deletions manifests/rule.pp
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
include 'aide'

ensure_resource('file', $ruledir, {
'ensure' => 'directory',
'owner' => 'root',
'group' => 'root',
'mode' => '0700',
'require' => Package['aide'],
'ensure' => 'directory',
'owner' => 'root',
'group' => 'root',
'mode' => '0700',
'require' => Package['aide'],
})

file { "${ruledir}/${name}_simp.conf":
Expand Down
6 changes: 3 additions & 3 deletions manifests/set_schedule.pp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"set entry[. = '${command}'][user = 'root']/time/month '${month}",
"set entry[. = '${command}'][user = 'root']/time/dayofweek '${weekday}"
],
onlyif => "match entry[. =~ ${_regex}][user = 'root'] size == 1"
onlyif => "match entry[. =~ ${_regex}][user = 'root'] size == 1"
}

# If it does not exist, create it
Expand All @@ -127,7 +127,7 @@
"set entry[last()]/time/dayofweek '${weekday}'",
'set entry[last()]/user "root"'
],
onlyif => "match entry[. =~ ${_regex}][user = 'root'] size == 0"
onlyif => "match entry[. =~ ${_regex}][user = 'root'] size == 0"
}

# If more than one exists, remove all of them and recreate it correctly
Expand All @@ -143,7 +143,7 @@
"set entry[last()]/time/dayofweek '${weekday}'",
'set entry[last()]/user "root"'
],
onlyif => "match entry[. =~ ${_regex}][user = 'root'] size > 1"
onlyif => "match entry[. =~ ${_regex}][user = 'root'] size > 1"
}
}
else {
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-aide",
"version": "9.0.0",
"version": "9.0.1",
"author": "SIMP Team",
"summary": "manages AIDE",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# The next baseline sync will overwrite any local changes made to this file.
# ------------------------------------------------------------------------------

require 'puppetlabs_spec_helper/module_spec_helper'
require 'voxpupuli/test/spec_helper'
require 'rspec-puppet'
require 'simp/rspec-puppet-facts'
include Simp::RspecPuppetFacts
Expand Down