summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-03-25 19:00:57 -0700
committerTim Smith <tsmith84@gmail.com>2021-03-25 19:00:57 -0700
commit78413e2e491530ee4b96c7f617da08c67f1e772e (patch)
treeea5fbc7646b5e7544b319825ac966035ff8d7e80
parent43a28050b25d82cc1747a292b917d5775ae7ace7 (diff)
downloadchef-78413e2e491530ee4b96c7f617da08c67f1e772e.tar.gz
Sync over misc omnibus changes
Misc stuff from chef 16 Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--omnibus/README.md7
-rw-r--r--omnibus/files/openssl-customization/windows/ssl_env_hack.rb4
-rw-r--r--omnibus/kitchen.yml39
-rw-r--r--omnibus/omnibus.rb2
-rwxr-xr-xomnibus/package-scripts/angrychef/postinst9
-rwxr-xr-xomnibus/package-scripts/angrychef/postrm8
6 files changed, 15 insertions, 54 deletions
diff --git a/omnibus/README.md b/omnibus/README.md
index 6e49f091a5..a10190c136 100644
--- a/omnibus/README.md
+++ b/omnibus/README.md
@@ -1,17 +1,16 @@
-# Client Tools Omnibus project
+# Chef Infra Client Omnibus project
This project creates full-stack platform-specific packages for the following projects:
- AngryChef
- Chef
-- Chef with FIPS enabled
## Installation
You must have a sane Ruby environment with Bundler installed. Ensure all the required gems are installed:
```shell
-$ bundle install --without development
+bundle install --without development
```
## Usage
@@ -117,7 +116,7 @@ For a complete list of all commands and platforms, run `kitchen list` or `kitche
## License
```text
-Copyright 2012-2018, Chef Software, Inc.
+Copyright:: Chef Software, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/omnibus/files/openssl-customization/windows/ssl_env_hack.rb b/omnibus/files/openssl-customization/windows/ssl_env_hack.rb
index eaa5949f2d..b86c17db82 100644
--- a/omnibus/files/openssl-customization/windows/ssl_env_hack.rb
+++ b/omnibus/files/openssl-customization/windows/ssl_env_hack.rb
@@ -16,8 +16,8 @@
#
# This script sets the SSL_CERT_FILE environment variable to the CA cert bundle
-# that ships with omnibus packages of Chef and Chef DK. If this environment
-# variable is already configured, this script is a no-op.
+# that ships with omnibus packages of Chef Infra Client and Chef Workstation. If
+# this environment variable is already configured, this script is a no-op.
#
# This is required to make Chef tools use https URLs out of the box.
diff --git a/omnibus/kitchen.yml b/omnibus/kitchen.yml
index 86c2afa241..bd2893ab83 100644
--- a/omnibus/kitchen.yml
+++ b/omnibus/kitchen.yml
@@ -34,58 +34,33 @@ platforms:
run_list: yum-epel::default
- name: centos-7
run_list: yum-epel::default
- - name: debian-8
- run_list: apt::default
- name: debian-9
run_list: apt::default
- name: freebsd-11
run_list: freebsd::portsnap
- name: ubuntu-16.04
run_list: apt::default
- - name: ubuntu-18.04
- run_list: apt::default
- # The following (private) boxes are shared via Vagrant Cloud and are only
- # available to users working for Chef. Sorry, it's about software licensing.
- #
- # Chef-internal users, you will need to:
- # 1. Create an Vagrant Cloud account: http://vagrantcloud.com/
- # 2. Ping #releng-support with your account name to be added to the relevant team.
- # 3. Do `vagrant login` with your creds so that you can download the private boxes.
- #
- # The macOS boxes are VMware only also. You can enable VMware Fusion
- # by activating the `kitchen.vmware.yml` file with the `KITCHEN_LOCAL_YAML`
- # environment variable:
- #
- # KITCHEN_LOCAL_YAML=kitchen.vmware.yml kitchen converge chef-macosx-1011
- #
- # OSX
- <% %w(
- macosx-10.11
- macos-10.12
- macos-10.13
- ).each do |mac_version| %>
- - name: <%= mac_version %>
+ # macOS
+ - name: macos-10.15
driver:
- provider: vmware_fusion
customize:
numvcpus: 4
memsize: 4096
- box: chef/macosx-<%= mac_version %> # private
+ box: tas50/macos_10.15
synced_folders:
- ['..', '/Users/vagrant/chef']
- ['../../omnibus', '/Users/vagrant/omnibus']
- ['../../omnibus-software', '/Users/vagrant/omnibus-software']
- <% end %>
<% %w(
- 10-enterprise
- server-2012r2-standard
+ 10
+ 2012r2
).each do |win_version| %>
# Windows 64-bit
- name: windows-<%= win_version %>
driver:
- box: chef/windows-<%= win_version %> # private
+ box: tas50/windows-<%= win_version %> # private
synced_folders:
# We have to mount this repos enclosing folder as the Omnibus build
# gets cranky if the mounted Chef source folder is a symlink. This
@@ -109,7 +84,7 @@ platforms:
# will load the 32-bit version of the MinGW toolchain.
- name: windows-<%= win_version %>-i386
driver:
- box: chef/windows-<%= win_version %> # private
+ box: tas50/windows-<%= win_version %> # private
synced_folders:
- ['../..', '/vagrant/code']
communicator: winrm
diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb
index e839174138..c04c3a87a0 100644
--- a/omnibus/omnibus.rb
+++ b/omnibus/omnibus.rb
@@ -1,5 +1,5 @@
#
-# This file is used to configure the Omnibus projects in this repo. It contains
+# This file is used to configure the Chef Infra Client project. It contains
# some minimal configuration examples for working with Omnibus. For a full list
# of configurable options, please see the documentation for +omnibus/config.rb+.
#
diff --git a/omnibus/package-scripts/angrychef/postinst b/omnibus/package-scripts/angrychef/postinst
index 9f01f7a848..c8f75105ce 100755
--- a/omnibus/package-scripts/angrychef/postinst
+++ b/omnibus/package-scripts/angrychef/postinst
@@ -26,14 +26,7 @@ is_darwin()
uname -a | grep "^Darwin" 2>&1 >/dev/null
}
-is_smartos()
-{
- uname -v | grep "^joyent" 2>&1 >/dev/null
-}
-
-if is_smartos; then
- PREFIX="/opt/local"
-elif is_darwin; then
+if is_darwin; then
PREFIX="/usr/local"
mkdir -p "$PREFIX/bin"
else
diff --git a/omnibus/package-scripts/angrychef/postrm b/omnibus/package-scripts/angrychef/postrm
index b8d7c31563..43b5f22c98 100755
--- a/omnibus/package-scripts/angrychef/postrm
+++ b/omnibus/package-scripts/angrychef/postrm
@@ -7,10 +7,6 @@
# this programming language. do not touch.
# - if you are under 40, get peer review from your elders.
-is_smartos() {
- uname -v | grep "^joyent" 2>&1 >/dev/null
-}
-
is_darwin() {
uname -a | grep "^Darwin" 2>&1 >/dev/null
}
@@ -24,9 +20,7 @@ is_suse() {
fi
}
-if is_smartos; then
- PREFIX="/opt/local"
-elif is_darwin; then
+if is_darwin; then
PREFIX="/usr/local"
else
PREFIX="/usr"