Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging in code from my private module #26

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
250c053
Initial commit of work to add hcl output capability
Mar 27, 2023
b42118d
Added new params to old json config and added extra config to new hcl
Mar 28, 2023
22e144e
Add capability to upgrade vault bin if using archive install method
Mar 28, 2023
6a332f2
Updating README
Mar 28, 2023
3443a6a
Adding updated reference.md
Mar 29, 2023
be7614e
Fixed failed tests
Mar 29, 2023
aa7efac
Drop Puppet 6 support
bastelfreak Apr 28, 2023
91e014a
modulesync 7.0.0
bastelfreak Aug 21, 2023
6860ded
Add Puppet 8 support
bastelfreak Aug 21, 2023
49fc2e5
puppetlabs/stdlib: Allow 9.x
bastelfreak Aug 21, 2023
1b6da4e
puppet/archive: Allow 7.x
bastelfreak Aug 21, 2023
69669c2
puppet/hashi_stack: Allow 3.x
bastelfreak Aug 21, 2023
122d57f
puppet/systemd: Allow 5.x
bastelfreak Aug 21, 2023
eaae430
stm/file_capability: Allow 6.x
bastelfreak Aug 21, 2023
ff4c5da
Add EL8/9 & Rocky/AlmaLinux/OracleLinux support
bastelfreak Aug 21, 2023
73f849e
Release 4.0.0
bastelfreak Aug 21, 2023
01b7a78
[blacksmith] Bump version to 4.0.1-rc0
bastelfreak Aug 21, 2023
5140be5
Add Debian 12 support
bastelfreak Nov 18, 2023
69411a3
puppet/systemd: Allow 6.x
bastelfreak Nov 19, 2023
d43d6b1
Release 4.1.0
bastelfreak Nov 19, 2023
b09c253
[blacksmith] Bump version to 4.1.1-rc0
bastelfreak Nov 19, 2023
0c2e73e
The package resource name was hardcoded instead of using the value in…
sirinek Apr 11, 2023
f440526
modulesync 7.2.0
bastelfreak Dec 15, 2023
e9c1646
modulesync 7.3.0
zilchms Feb 6, 2024
f8433c9
modulesync 7.4.0
bastelfreak Apr 14, 2024
3075cf7
modulesync 7.5.0
zilchms Apr 25, 2024
8ae83dc
update puppet-systemd upper bound to 8.0.0
TheMeier Apr 26, 2024
8c4e6ed
This commit should address issues raised in #26
avitacco May 23, 2024
7dc4b9c
Updating tests to include new config file name
avitacco May 23, 2024
26eb48a
Updated code and tests to fix test failures
avitacco May 23, 2024
c7ba81e
Fixing REFERENCE.md
avitacco May 24, 2024
ed1f522
Fixing deprication (probably)
avitacco May 24, 2024
001e289
Another round of fixing my embarassing PR
avitacco May 30, 2024
afb721e
Forgot to update REFERENCE.md file
avitacco May 30, 2024
8db5293
I'm not sure why the acceptance tests are failing.
avitacco May 31, 2024
b9e6e25
Fixes for the service file
avitacco Jul 12, 2024
4e71a80
Adding header to service file
avitacco Jul 15, 2024
1271891
Last round of fixes (fingers crossed)
avitacco Jul 15, 2024
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
27 changes: 20 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,29 @@ You can install all needed gems for spec tests into the modules directory by
running:

```sh
bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
bundle config set --local path '.vendor/'
bundle config set --local without 'development system_tests release'
bundle install --jobs "$(nproc)"
```

If you also want to run acceptance tests:

```sh
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
bundle config set --local path '.vendor/'
bundle config set --local without 'development release'
bundle config set --local with 'system_tests'
bundle install --jobs "$(nproc)"
```

Our all in one solution if you don't know if you need to install or update gems:

```sh
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
bundle config set --local path '.vendor/'
bundle config set --local without 'development release'
bundle config set --local with 'system_tests'
bundle install --jobs "$(nproc)"
bundle update
bundle clean
```

As an alternative to the `--jobs "$(nproc)` parameter, you can set an
Expand Down Expand Up @@ -232,18 +242,21 @@ simple tests against it after applying the module. You can run this
with:

```sh
BEAKER_setfile=debian11-64 bundle exec rake beaker
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
```

You can replace the string `debian10` with any common operating system.
You can replace the string `debian11` with any common operating system.
The following strings are known to work:

* ubuntu1804
* ubuntu2004
* debian10
* ubuntu2204
* debian11
* centos7
* centos8
* centos9
* almalinux8
* almalinux9
* fedora36

For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@

name: CI

on: pull_request
on:
pull_request: {}
push:
branches:
- main
- master

concurrency:
group: ${{ github.ref_name }}
Expand All @@ -13,6 +18,6 @@ concurrency:
jobs:
puppet:
name: Puppet
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
with:
pidfile_workaround: 'false'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
release:
name: Release
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
with:
allowed_owner: 'voxpupuli'
secrets:
Expand Down
38 changes: 20 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

pkg/
Gemfile.lock
Gemfile.local
vendor/
.vendor/
spec/fixtures/manifests/
spec/fixtures/modules/
.vagrant/
.bundle/
.ruby-version
coverage/
log/
.idea/
.dependencies/
.librarian/
Puppetfile.lock
/pkg/
/Gemfile.lock
/Gemfile.local
/vendor/
/.vendor/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/.vagrant/
/.bundle/
/.ruby-version
/coverage/
/log/
/.idea/
/.dependencies/
/.librarian/
/Puppetfile.lock
*.iml
.*.sw?
.yardoc/
Guardfile
/.yardoc/
/Guardfile
bolt-debug.log
.rerun.json
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '5.4.0'
modulesync_config_version: '7.5.0'
65 changes: 33 additions & 32 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -1,37 +1,38 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

docs/
pkg/
Gemfile
Gemfile.lock
Gemfile.local
vendor/
.vendor/
spec/
Rakefile
.vagrant/
.bundle/
.ruby-version
coverage/
log/
.idea/
.dependencies/
.github/
.librarian/
Puppetfile.lock
/docs/
/pkg/
/Gemfile
/Gemfile.lock
/Gemfile.local
/vendor/
/.vendor/
/spec/
/Rakefile
/.vagrant/
/.bundle/
/.ruby-version
/coverage/
/log/
/.idea/
/.dependencies/
/.github/
/.librarian/
/Puppetfile.lock
*.iml
.editorconfig
.fixtures.yml
.gitignore
.msync.yml
.overcommit.yml
.pmtignore
.rspec
.rspec_parallel
.rubocop.yml
.sync.yml
/.editorconfig
/.fixtures.yml
/.gitignore
/.msync.yml
/.overcommit.yml
/.pmtignore
/.rspec
/.rspec_parallel
/.rubocop.yml
/.sync.yml
.*.sw?
.yardoc/
.yardopts
Dockerfile
/.yardoc/
/.yardopts
/Dockerfile
/HISTORY.md
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,33 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v4.1.0](https://github.com/voxpupuli/puppet-vault/tree/v4.1.0) (2023-11-19)

[Full Changelog](https://github.com/voxpupuli/puppet-vault/compare/v4.0.0...v4.1.0)

**Implemented enhancements:**

- puppet/systemd: Allow 6.x [\#43](https://github.com/voxpupuli/puppet-vault/pull/43) ([bastelfreak](https://github.com/bastelfreak))
- Add Debian 12 support [\#42](https://github.com/voxpupuli/puppet-vault/pull/42) ([bastelfreak](https://github.com/bastelfreak))

## [v4.0.0](https://github.com/voxpupuli/puppet-vault/tree/v4.0.0) (2023-08-21)

[Full Changelog](https://github.com/voxpupuli/puppet-vault/compare/v3.0.0...v4.0.0)

**Breaking changes:**

- Drop Puppet 6 support [\#30](https://github.com/voxpupuli/puppet-vault/pull/30) ([bastelfreak](https://github.com/bastelfreak))

**Implemented enhancements:**

- Add EL8/9 & Rocky/AlmaLinux/OracleLinux support [\#40](https://github.com/voxpupuli/puppet-vault/pull/40) ([bastelfreak](https://github.com/bastelfreak))
- stm/file\_capability: Allow 6.x [\#39](https://github.com/voxpupuli/puppet-vault/pull/39) ([bastelfreak](https://github.com/bastelfreak))
- puppet/systemd: Allow 5.x [\#38](https://github.com/voxpupuli/puppet-vault/pull/38) ([bastelfreak](https://github.com/bastelfreak))
- puppet/hashi\_stack: Allow 3.x [\#37](https://github.com/voxpupuli/puppet-vault/pull/37) ([bastelfreak](https://github.com/bastelfreak))
- puppet/archive: Allow 7.x [\#36](https://github.com/voxpupuli/puppet-vault/pull/36) ([bastelfreak](https://github.com/bastelfreak))
- puppetlabs/stdlib: Allow 9.x [\#35](https://github.com/voxpupuli/puppet-vault/pull/35) ([bastelfreak](https://github.com/bastelfreak))
- Add Puppet 8 support [\#34](https://github.com/voxpupuli/puppet-vault/pull/34) ([bastelfreak](https://github.com/bastelfreak))

## [v3.0.0](https://github.com/voxpupuli/puppet-vault/tree/v3.0.0) (2023-02-24)

[Full Changelog](https://github.com/voxpupuli/puppet-vault/compare/v2.3.0...v3.0.0)
Expand Down
24 changes: 0 additions & 24 deletions Dockerfile

This file was deleted.

12 changes: 5 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 5.4', :require => false
gem 'voxpupuli-test', '~> 7.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 2.0', :require => false
gem 'puppet_metadata', '~> 3.5', :require => false
gem 'rspec-json_expectations', :require => false
end

Expand All @@ -17,19 +17,17 @@ group :development do
end

group :system_tests do
gem 'voxpupuli-acceptance', '~> 1.0', :require => false
gem 'voxpupuli-acceptance', '~> 3.0', :require => false
end

group :release do
gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5'
gem 'voxpupuli-release', '>= 1.2.0', :require => false
gem 'puppet-strings', '>= 2.2', :require => false
gem 'voxpupuli-release', '~> 3.0', :require => false
end

gem 'rake', :require => false
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]

puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
gem 'puppet', puppetversion, :require => false, :groups => [:test]

# vim: syntax=ruby
Loading