File tree Expand file tree Collapse file tree 6 files changed +20
-9
lines changed
integration/config_3/controls Expand file tree Collapse file tree 6 files changed +20
-9
lines changed Original file line number Diff line number Diff line change 1- # .mise.toml
2-
31[env ]
4- PATH = " /opt/chef-workstation/bin:/opt/chef-workstation/embedded/bin:{{env.PATH}}"
5- KITCHEN_LOCAL_YAML = " kitchen.dokken.yml"
2+ _.path = " /opt/chef-workstation/bin"
Original file line number Diff line number Diff line change 1+ # Disable epel-next for CentOS Stream 10 as it doesn't exist
2+ if platform_family? ( 'rhel' ) && node [ 'platform_version' ] . to_i >= 10
3+ default [ 'yum' ] [ 'epel-next' ] [ 'managed' ] = false
4+ end
Original file line number Diff line number Diff line change 3434 http_response 'set-header Expires %[date(3600),http_date]'
3535 default_backend 'servers'
3636 option %w( dontlog-normal )
37- extra_options ( 'bind-process' => 'odd' )
37+ # bind-process is deprecated in HAProxy 2.5+ and removed in 3.x
38+ extra_options ( 'bind-process' => 'odd' ) unless node [ 'platform_version' ] . to_i >= 10
3839 hash_type 'consistent'
3940end
4041
Original file line number Diff line number Diff line change 33# install lua dependencies
44case node [ 'platform_family' ]
55when 'rhel' , 'fedora'
6- package %w(
6+ # Use pcre2-devel on RHEL/CentOS >= 10, pcre-devel on older versions
7+ pcre_pkg = node [ 'platform_version' ] . to_i >= 10 ? 'pcre2-devel' : 'pcre-devel'
8+ package %W(
79 readline-devel
810 ncurses-devel
9- pcre-devel
11+ #{ pcre_pkg }
1012 openssl-devel
1113 zlib-devel
1214 )
Original file line number Diff line number Diff line change 22
33# package %w(build-essential zlib1g-dev) if platform_family?('debian')
44
5+ # Install perl modules for OpenSSL configure script on RHEL/CentOS >= 10
6+ package %w( perl-FindBin perl-lib perl-File-Compare perl-File-Copy perl-IPC-Cmd perl-Pod-Html ) if platform_family? ( 'rhel' , 'fedora' ) && node [ 'platform_version' ] . to_i >= 10
7+
58# package %w(make gcc perl pcre-devel zlib-devel perl-core) if platform_family?('rhel')
69
710# override environment variable
Original file line number Diff line number Diff line change 7272 ' http-response set-header Expires %\[date\(3600\),http_date\]' ,
7373 ' default_backend servers' ,
7474 ' option dontlog-normal' ,
75- ' bind-process odd' ,
76- ' hash-type consistent' ,
7775]
7876
77+ platform_version = os . release . to_i
78+ if platform_version < 10
79+ cfg_content << ' bind-process odd'
80+ end
81+ cfg_content << ' hash-type consistent'
82+
7983describe file ( '/etc/haproxy/haproxy.cfg' ) do
8084 its ( 'content' ) { should match ( /#{ cfg_content . join ( '\n' ) } / ) }
8185end
You can’t perform that action at this time.
0 commit comments