Showing with 367 additions and 683 deletions.
  1. +3 −3 .fixtures.yml
  2. +20 −10 .github/workflows/ci.yaml
  3. +2 −1 .github/workflows/release.yaml
  4. +18 −9 .sync.yml
  5. +99 −84 CHANGELOG.md
  6. +6 −6 Gemfile
  7. +1 −1 LICENSE
  8. +38 −2 REFERENCE.md
  9. +2 −1 Rakefile
  10. +1 −1 UPGRADING.md
  11. +0 −68 data/os/Debian/10.yaml
  12. +0 −74 data/os/Ubuntu/18.04.yaml
  13. +1 −0 manifests/config_file_server.pp
  14. +19 −7 manifests/init.pp
  15. +27 −9 manifests/server.pp
  16. +6 −8 metadata.json
  17. +8 −5 spec/acceptance/nodesets/{debian-10.yml → debian-11.yml}
  18. +0 −25 spec/acceptance/nodesets/debian-8.yml
  19. 0 spec/acceptance/nodesets/{centos-7.yml → el7.yml}
  20. +8 −5 spec/acceptance/nodesets/{rocky-8.yml → el8.yml}
  21. +4 −4 spec/acceptance/nodesets/{rocky-9.yml → el9.yml}
  22. +9 −6 spec/acceptance/nodesets/{ubuntu-1804.yml → ubuntu-2004.yml}
  23. +5 −2 spec/acceptance/nodesets/ubuntu-2204.yml
  24. +1 −1 spec/classes/init_params_spec.rb
  25. +27 −1 spec/classes/init_spec.rb
  26. +2 −2 spec/classes/server_data_types_spec.rb
  27. +1 −1 spec/classes/server_params_spec.rb
  28. +28 −1 spec/classes/server_spec.rb
  29. +14 −0 spec/defines/config_file_server_spec.rb
  30. +0 −61 spec/fixtures/ssh_config_debian10
  31. +0 −133 spec/fixtures/sshd_config_debian10
  32. +0 −24 spec/fixtures/testing/Debian-10_ssh_config
  33. +0 −42 spec/fixtures/testing/Debian-10_sshd_config
  34. +1 −1 spec/fixtures/testing/Debian-11_sshd_config
  35. +1 −1 spec/fixtures/testing/RedHat-9_sshd_config
  36. +0 −24 spec/fixtures/testing/Ubuntu-18.04_ssh_config
  37. +0 −48 spec/fixtures/testing/Ubuntu-18.04_sshd_config
  38. +1 −1 spec/fixtures/testing/Ubuntu-20.04_sshd_config
  39. +1 −1 spec/fixtures/testing/Ubuntu-22.04_sshd_config
  40. 0 spec/{fixtures/hiera → }/hiera.yaml
  41. +3 −3 spec/spec_helper.rb
  42. +1 −2 spec/unit/facter/ssh_spec.rb
  43. +3 −1 templates/ssh_config.erb
  44. +6 −4 templates/sshd_config.erb
6 changes: 3 additions & 3 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ fixtures:
repositories:
stdlib:
repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
ref: 'v8.0.0'
ref: 'v9.0.0'
concat:
repo: 'https://github.com/puppetlabs/puppetlabs-concat.git'
ref: 'v7.0.0'
ref: 'v9.0.0'
sshkeys:
repo: 'https://github.com/puppetlabs/puppetlabs-sshkeys_core.git'
ref: 'v2.3.0'
ref: 'v2.4.0'
30 changes: 20 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,35 @@ jobs:
fail-fast: false
matrix:
include:
- ruby: 2.7.6
- ruby: 2.7.8
puppet: 7
fixtures: .fixtures.yml
allow_failure: false
- ruby: 2.7.6
- ruby: 2.7.8
puppet: 7
fixtures: .fixtures-latest.yml
allow_failure: true
- ruby: 3.2.2
puppet: 8
fixtures: .fixtures.yml
allow_failure: false
- ruby: 3.2.2
puppet: 8
fixtures: .fixtures-latest.yml
allow_failure: true
env:
BUNDLE_WITHOUT: system_tests:release
PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}.0"
FACTER_GEM_VERSION: "< 4.0"
FIXTURES_YML: ${{ matrix.fixtures }}
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }})
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
cache-version: 2
bundler: '2.1.0'
- name: Validate
run: bundle exec rake check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint
Expand All @@ -47,14 +55,15 @@ jobs:
fail-fast: false
matrix:
set:
- "debian-10"
- "centos-7"
- "rocky-8"
- "rocky-9"
- "ubuntu-1804"
- "el8"
- "el9"
- "debian-11"
- "ubuntu-2004"
- "ubuntu-2204"
- "el7"
puppet:
- "puppet7"
- "puppet8"
env:
BUNDLE_WITHOUT: development:release
BEAKER_debug: true
Expand All @@ -71,12 +80,13 @@ jobs:
sudo apt-get remove mysql-server --purge
sudo apt-get install apparmor-profiles
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
bundler-cache: true
cache-version: 2
bundler: '2.1.0'
- name: Run tests
run: bundle exec rake beaker
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
bundler-cache: true
cache-version: 2
bundler: '2.1.0'
- name: Build and Deploy
env:
Expand Down
27 changes: 18 additions & 9 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,27 @@
# See https://github.com/puppetlabs/pdk-templates/blob/main/config_defaults.yml
# for the default values.
---
.github/workflows/ci.yaml:
acceptance_matrix:
set:
- el7
- el8
- el9
- debian-11
- ubuntu-2004
- ubuntu-2204
puppet:
- puppet7
- puppet8
.github/workflows/release.yaml:
username: ghoneycutt
spec/spec_helper.rb:
coverage_report: true
minimum_code_coverage_percentage: 100
hiera_config: spec/hiera.yaml
appveyor.yml:
delete: true

.gitlab-ci.yml:
delete: true

.travis.yml:
delete: true

spec/spec_helper.rb:
coverage_report: true
minimum_code_coverage_percentage: 100
# add hiera data for testing
hiera_config: 'spec/fixtures/hiera/hiera.yaml'
mock_with: ':mocha'
Loading