File tree Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -32,9 +32,6 @@ script:
32
32
- bundle exec rake kitchen KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
33
33
34
34
matrix :
35
- allow_failures :
36
- # temporaray disable failing tests until all problems are fixed
37
- - env : INSTANCE=centos-8
38
35
include :
39
36
- env : UNIT_AND_LINT=1
40
37
script :
Original file line number Diff line number Diff line change 31
31
default [ 'ssh-hardening' ] [ 'sshclient' ] [ 'package' ] = 'openssh-client'
32
32
end
33
33
34
+ # Define the package name for selinux utils
35
+ if node [ 'platform_family' ] == 'fedora' || # rubocop:disable Style/ConditionalAssignment
36
+ node [ 'platform_family' ] == 'rhel' && node [ 'platform_version' ] . to_f >= 8
37
+ default [ 'ssh-hardening' ] [ 'selinux' ] [ 'package' ] = 'policycoreutils-python-utils'
38
+ else
39
+ default [ 'ssh-hardening' ] [ 'selinux' ] [ 'package' ] = 'policycoreutils-python'
40
+ end
41
+
34
42
# Define the server package name
35
43
case node [ 'platform' ]
36
44
when 'suse' , 'opensuse' , 'opensuseleap'
Original file line number Diff line number Diff line change 56
56
module_file = ::File . join ( cache_dir , 'ssh_password.mod' )
57
57
package_file = ::File . join ( cache_dir , 'ssh_password.pp' )
58
58
59
- package 'policycoreutils-python'
60
- # on fedora we need an addtional package for semodule_package
61
- package 'policycoreutils-python-utils' if node [ 'platform_family' ] == 'fedora'
59
+ package node [ 'ssh-hardening' ] [ 'selinux' ] [ 'package' ]
62
60
63
61
if node [ 'ssh-hardening' ] [ 'ssh' ] [ 'server' ] [ 'use_pam' ]
64
62
# UsePAM yes: disable and remove the additional SELinux policy
You can’t perform that action at this time.
0 commit comments