Showing with 67 additions and 34 deletions.
  1. +1 −1 .msync.yml
  2. +1 −0 .rspec_parallel
  3. +4 −0 .rubocop.yml
  4. +3 −0 .travis.yml
  5. +9 −1 CHANGELOG.md
  6. +1 −0 Gemfile
  7. +1 −1 docs/_index.html
  8. +1 −1 docs/file.README.html
  9. +1 −1 docs/index.html
  10. +1 −1 docs/puppet_classes/selinux.html
  11. +1 −1 docs/puppet_classes/selinux_3A_3Aconfig.html
  12. +1 −1 docs/puppet_classes/selinux_3A_3Apackage.html
  13. +1 −1 docs/puppet_classes/selinux_3A_3Aparams.html
  14. +1 −1 docs/puppet_classes/selinux_3A_3Arefpolicy_package.html
  15. +1 −1 docs/puppet_defined_types/selinux_3A_3Aboolean.html
  16. +1 −1 docs/puppet_defined_types/selinux_3A_3Aexec_restorecon.html
  17. +1 −1 docs/puppet_defined_types/selinux_3A_3Afcontext.html
  18. +1 −1 docs/puppet_defined_types/selinux_3A_3Afcontext_3A_3Aequivalence.html
  19. +1 −1 docs/puppet_defined_types/selinux_3A_3Amodule.html
  20. +1 −1 docs/puppet_defined_types/selinux_3A_3Apermissive.html
  21. +1 −1 docs/puppet_defined_types/selinux_3A_3Aport.html
  22. +1 −1 docs/puppet_providers_selinux_fcontext/semanage.html
  23. +1 −1 docs/puppet_providers_selinux_fcontext_equivalence/semanage.html
  24. +1 −1 docs/puppet_providers_selinux_permissive/semanage.html
  25. +1 −1 docs/puppet_providers_selinux_port/semanage.html
  26. +1 −1 docs/puppet_types/selinux_fcontext.html
  27. +1 −1 docs/puppet_types/selinux_fcontext_equivalence.html
  28. +1 −1 docs/puppet_types/selinux_permissive.html
  29. +1 −1 docs/puppet_types/selinux_port.html
  30. +1 −1 docs/top-level-namespace.html
  31. +2 −2 metadata.json
  32. +13 −0 spec/acceptance/nodesets/archlinux-2-x64.yml
  33. +5 −5 spec/acceptance/selinux_permissive_spec.rb
  34. +4 −1 spec/defines/selinux_exec_restorecon_spec.rb
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.21.1'
modulesync_config_version: '0.21.3'
1 change: 1 addition & 0 deletions .rspec_parallel
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--format progress
4 changes: 4 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,10 @@ Style/ClosingParenthesisIndentation:

# RSpec

RSpec/BeforeAfterAll:
Exclude:
- spec/acceptance/**/*

# We don't use rspec in this way
RSpec/DescribeClass:
Enabled: False
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ matrix:
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 5.0" CHECK=test
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ 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 impact the functionality of the module.

## [v1.1.0](https://github.com/voxpupuli/puppet-selinux/tree/v1.1.0) (2017-05-08)
## [v1.2.0](https://github.com/voxpupuli/puppet-selinux/tree/v1.2.0) (2017-07-02)
[Full Changelog](https://github.com/voxpupuli/puppet-selinux/compare/v1.1.0...v1.2.0)

**Implemented enhancements:**

- Declare Puppet 5 compatability [\#226](https://github.com/voxpupuli/puppet-selinux/pull/226) ([vinzent](https://github.com/vinzent))

## [v1.1.0](https://github.com/voxpupuli/puppet-selinux/tree/v1.1.0) (2017-05-11)
[Full Changelog](https://github.com/voxpupuli/puppet-selinux/compare/v1.0.0...v1.1.0)

**Implemented enhancements:**
Expand All @@ -22,6 +29,7 @@ These should not impact the functionality of the module.

**Merged pull requests:**

- Release 1.1.0 [\#219](https://github.com/voxpupuli/puppet-selinux/pull/219) ([oranenj](https://github.com/oranenj))
- Fedora 26 uses the same package\_name as Fedora 25 [\#218](https://github.com/voxpupuli/puppet-selinux/pull/218) ([logic](https://github.com/logic))
- Ensure the module build tmp/ directory is actually a directory [\#216](https://github.com/voxpupuli/puppet-selinux/pull/216) ([oranenj](https://github.com/oranenj))

Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ group :test do
gem 'github_changelog_generator', '~> 1.13.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'github_changelog_generator', :require => false if RUBY_VERSION >= '2.2.2'
gem 'parallel_tests', :require => false
end

group :development do
Expand Down
2 changes: 1 addition & 1 deletion docs/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ <h2>File Listing</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:42 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/file.README.html
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ <h2>Authors</h2>
</div></div>

<div id="footer">
Generated on Fri May 5 19:31:42 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ <h2>Authors</h2>
</div></div>

<div id="footer">
Generated on Fri May 5 19:31:42 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_classes/selinux.html
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:42 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_classes/selinux_3A_3Aconfig.html
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ <h2>Config for module building</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:42 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_classes/selinux_3A_3Apackage.html
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ <h1>THIS IS A PRIVATE CLASS</h1>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_classes/selinux_3A_3Aparams.html
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ <h1>THIS IS A PRIVATE CLASS</h1>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_classes/selinux_3A_3Arefpolicy_package.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ <h1>THIS IS A PRIVATE CLASS</h1>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_defined_types/selinux_3A_3Aboolean.html
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_defined_types/selinux_3A_3Afcontext.html
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_defined_types/selinux_3A_3Amodule.html
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_defined_types/selinux_3A_3Apermissive.html
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_defined_types/selinux_3A_3Aport.html
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_providers_selinux_fcontext/semanage.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_providers_selinux_permissive/semanage.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_providers_selinux_port/semanage.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_types/selinux_fcontext.html
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_types/selinux_fcontext_equivalence.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_types/selinux_permissive.html
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/puppet_types/selinux_port.html
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ <h2>Overview</h2>
</div>

<div id="footer">
Generated on Fri May 5 19:31:43 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/top-level-namespace.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
</div>

<div id="footer">
Generated on Fri May 5 19:31:42 2017 by
Generated on Sun Jul 2 11:23:01 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.3.3).
</div>
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-selinux",
"version": "1.1.0",
"version": "1.2.0",
"author": "Vox Pupuli",
"summary": "This class manages SELinux on RHEL based systems",
"license": "Apache-2.0",
Expand Down Expand Up @@ -32,7 +32,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.6.1 < 5.0.0"
"version_requirement": ">= 4.7.0 < 6.0.0"
}
]
}
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/archlinux-2-x64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
archlinux-2-x64:
roles:
- master
platform: archlinux-2-x64
box: archlinux/archlinux
hypervisor: vagrant
CONFIG:
type: foss
10 changes: 5 additions & 5 deletions spec/acceptance/selinux_permissive_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
apply_manifest(manifest, catch_failures: true)
end

after :all do # rubocop:disable RSpec/BeforeAfterAll
after :all do
# cleanup
shell('semanage permissive -d passwd_t', acceptable_exit_codes: [0, 1])
end
Expand All @@ -19,7 +19,7 @@
end
end
context 'purge with ensure present for passwd_t, when kernel_t is permissive' do
before :all do # rubocop:disable RSpec/BeforeAfterAll
before :all do
shell('semanage permissive -a kernel_t')
end
let(:result) do
Expand All @@ -30,7 +30,7 @@
apply_manifest(manifest, catch_failures: true)
end

after :all do # rubocop:disable RSpec/BeforeAfterAll
after :all do
# clean up
shell('semanage permissive -d passwd_t', acceptable_exit_codes: [0, 1])
shell('semanage permissive -d kernel_t', acceptable_exit_codes: [0, 1])
Expand All @@ -46,7 +46,7 @@
end
end
context 'ensure absent for kernel_t only, when passwd_t is also permissive' do
before :all do # rubocop:disable RSpec/BeforeAfterAll
before :all do
shell('semanage permissive -a kernel_t')
shell('semanage permissive -a passwd_t')
end
Expand All @@ -55,7 +55,7 @@
apply_manifest(manifest, catch_failures: true)
end

after :all do # rubocop:disable RSpec/BeforeAfterAll
after :all do
# clean up
shell('semanage permissive -d passwd_t', acceptable_exit_codes: [0, 1])
shell('semanage permissive -d kernel_t', acceptable_exit_codes: [0, 1])
Expand Down
5 changes: 4 additions & 1 deletion spec/defines/selinux_exec_restorecon_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
let(:title) { '/opt/$HOME/some weird dir/' }

context 'with defaults' do
it { is_expected.to contain_exec('selinux::exec_restorecon /opt/$HOME/some weird dir/').with(command: "restorecon -R '/opt/$HOME/some weird dir/'", refreshonly: true) }
# started to fail with rspec-puppet 2.6.0, worked fine with rspec-puppet 2.5.0
# https://github.com/voxpupuli/puppet-selinux/issues/225
# https://github.com/rodjek/rspec-puppet/issues/536
xit { is_expected.to contain_exec('selinux::exec_restorecon /opt/$HOME/some weird dir/').with(command: "restorecon -R '/opt/$HOME/some weird dir/'", refreshonly: true) }
end
end
context 'with path /weird/\'pa th\'/"quotes"' do
Expand Down