diff options
| author | Tim Smith <tsmith84@gmail.com> | 2019-06-28 12:45:02 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2019-06-28 12:45:02 -0700 |
| commit | 34e553738e5fdd74ce7e823add2130d33e71003a (patch) | |
| tree | aeca9e0bc87293d00c9df891964bb0964ebcc01f | |
| parent | e5ba371c42a16619b3ea9b4696d3f33bdfc2b134 (diff) | |
| download | chef-34e553738e5fdd74ce7e823add2130d33e71003a.tar.gz | |
Move the habitat content back to the habitat directory
These were moved when the scafolding was in this dir
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .bldr.toml | 2 | ||||
| -rw-r--r-- | .rubocop.yml | 1 | ||||
| -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) | 0 |
7 files changed, 1 insertions, 2 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..ee5c154970 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,6 @@ AllCops: - "vendor/**/*" - "pkg/**/*" - "chef-config/pkg/**/*" - - "habitat-packages/**/*" 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 8d8d873956..8d8d873956 100644 --- a/habitat-packages/chef-client/plan.sh +++ b/habitat/chef-infra-client/plan.sh |