diff options
author | Tim Smith <tsmith@chef.io> | 2017-10-25 09:34:53 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2017-11-28 14:53:18 -0800 |
commit | 03336b2e0a62a81184153c93417ebdb23ee0a595 (patch) | |
tree | 1298865f79836f368eb2f60f9337e8c3006299da /kitchen-tests | |
parent | b9b6128e849e81c9ebe550a7f7e130e8efd18104 (diff) | |
download | chef-03336b2e0a62a81184153c93417ebdb23ee0a595.tar.gz |
Turn back on Fedora testing in Travis
Use the new openssh cookbook which has a Fedora fix
Turn off use_privilege_separation which doesn't work on Fedora
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests')
-rw-r--r-- | kitchen-tests/Berksfile.lock | 8 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/base/attributes/default.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index 6cd1308fcd..63a4ddd0b0 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -22,13 +22,13 @@ GRAPH build-essential (8.0.3) mingw (>= 1.1) seven_zip (>= 0.0.0) - chef-client (8.1.8) + chef-client (9.0.0) cron (>= 2.0.0) logrotate (>= 1.9.0) windows (>= 2.0.0) chef_hostname (0.6.1) compat_resource (12.19.0) - cron (4.1.3) + cron (4.2.0) compat_resource (>= 0.0.0) iptables (4.2.1) logrotate (2.2.0) @@ -39,7 +39,7 @@ GRAPH nscd (5.0.0) ntp (3.5.2) ohai (5.2.0) - openssh (2.5.0) + openssh (2.6.0) iptables (>= 1.0) resolver (2.0.1) selinux (2.1.0) @@ -49,5 +49,5 @@ GRAPH ubuntu (2.0.1) apt (>= 0.0.0) users (5.1.0) - windows (3.1.2) + windows (3.2.0) ohai (>= 4.0.0) diff --git a/kitchen-tests/cookbooks/base/attributes/default.rb b/kitchen-tests/cookbooks/base/attributes/default.rb index 75e57cb27b..0fd3855a6c 100644 --- a/kitchen-tests/cookbooks/base/attributes/default.rb +++ b/kitchen-tests/cookbooks/base/attributes/default.rb @@ -43,7 +43,7 @@ default["openssh"]["server"]["challenge_response_authentication"] = "no" default["openssh"]["server"]["kerberos_authentication"] = "no" # tcp keepalives are useful to keep connections up through VPNs and firewalls default["openssh"]["server"]["tcp_keepalive"] = "yes" -default["openssh"]["server"]["use_privilege_separation"] = "yes" +default["openssh"]["server"]["use_privilege_separation"] = "yes" unless platform?("fedora") default["openssh"]["server"]["max_start_ups"] = "10" # PAM (i think) already prints the motd on login default["openssh"]["server"]["print_motd"] = "no" |