summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-06-28 14:41:07 -0700
committerGitHub <noreply@github.com>2019-06-28 14:41:07 -0700
commit17b92c43f836f4e48a6c1dc1f3981b3822cb24cc (patch)
tree5126f1deb6bf2e2a76139b3789b34298bce1c12f
parente132c98be92a02fad94f87188c8a1d54ba0ac7b1 (diff)
parentbeeb7b0f40ad2ea43e259faf1c07f9416d7fac57 (diff)
downloadchef-17b92c43f836f4e48a6c1dc1f3981b3822cb24cc.tar.gz
Merge pull request #8698 from chef/chef-infra
Rename the habitat package to chef-infra-client
-rw-r--r--.bldr.toml2
-rw-r--r--.rubocop.yml2
-rw-r--r--habitat/chef-infra-client/config/client.rb (renamed from habitat-packages/chef-client/config/client.rb)0
-rw-r--r--habitat/chef-infra-client/default.toml (renamed from habitat-packages/chef-client/default.toml)0
-rw-r--r--habitat/chef-infra-client/hooks/init (renamed from habitat-packages/chef-client/hooks/init)0
-rw-r--r--habitat/chef-infra-client/hooks/run (renamed from habitat-packages/chef-client/hooks/run)0
-rw-r--r--habitat/chef-infra-client/plan.sh (renamed from habitat-packages/chef-client/plan.sh)4
7 files changed, 4 insertions, 4 deletions
diff --git a/.bldr.toml b/.bldr.toml
index b3d8c1a158..ac74ac9215 100644
--- a/.bldr.toml
+++ b/.bldr.toml
@@ -1,5 +1,5 @@
[chef-client]
-plan_path = "habitat-packages/chef-client"
+plan_path = "habitat/chef-infra-client"
build_targets = [
"x86_64-linux",
"x86_64-linux-kernel2"
diff --git a/.rubocop.yml b/.rubocop.yml
index 575cde4c70..c3eba7db55 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ AllCops:
- "vendor/**/*"
- "pkg/**/*"
- "chef-config/pkg/**/*"
- - "habitat-packages/**/*"
+ - "habitat/**/*"
Security/Eval:
Enabled: false
Lint/UselessAssignment:
diff --git a/habitat-packages/chef-client/config/client.rb b/habitat/chef-infra-client/config/client.rb
index 3dd6d67e1b..3dd6d67e1b 100644
--- a/habitat-packages/chef-client/config/client.rb
+++ b/habitat/chef-infra-client/config/client.rb
diff --git a/habitat-packages/chef-client/default.toml b/habitat/chef-infra-client/default.toml
index 2bea08934b..2bea08934b 100644
--- a/habitat-packages/chef-client/default.toml
+++ b/habitat/chef-infra-client/default.toml
diff --git a/habitat-packages/chef-client/hooks/init b/habitat/chef-infra-client/hooks/init
index a23344b2a9..a23344b2a9 100644
--- a/habitat-packages/chef-client/hooks/init
+++ b/habitat/chef-infra-client/hooks/init
diff --git a/habitat-packages/chef-client/hooks/run b/habitat/chef-infra-client/hooks/run
index 598d609d7f..598d609d7f 100644
--- a/habitat-packages/chef-client/hooks/run
+++ b/habitat/chef-infra-client/hooks/run
diff --git a/habitat-packages/chef-client/plan.sh b/habitat/chef-infra-client/plan.sh
index 5c5ff1da37..146f162718 100644
--- a/habitat-packages/chef-client/plan.sh
+++ b/habitat/chef-infra-client/plan.sh
@@ -1,7 +1,7 @@
-pkg_name=chef-client
+pkg_name=chef-infra-client
pkg_origin=chef
pkg_maintainer="The Chef Maintainers <humans@chef.io>"
-pkg_description="The Chef Client"
+pkg_description="The Chef Infra Client"
pkg_license=('Apache-2.0')
pkg_filename="${pkg_name}-${pkg_version}.tar.gz"
pkg_bin_dirs=(bin)