Skip to content

Commit 07d6893

Browse files
committed
Updates to Cinc patches
Signed-off-by: Lance Albertson <lance@osuosl.org>
1 parent 0aa7b68 commit 07d6893

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

lib/chef-cli/command/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def needs_version?(params)
9292

9393
def check_license_acceptance
9494
# TODO - is this the right version?
95-
LicenseAcceptance::Acceptor.check_and_persist!("chef-workstation", ChefCLI::VERSION.to_s)
95+
LicenseAcceptance::Acceptor.check_and_persist!("cinc-workstation", ChefCLI::VERSION.to_s)
9696
end
9797

9898
end

lib/chef-cli/command/export.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Export < Base
3333
3434
`#{ChefCLI::Dist::EXEC} export` creates a #{ChefCLI::Dist::ZERO_PRODUCT} compatible #{ChefCLI::Dist::INFRA_PRODUCT} repository containing the
3535
cookbooks described in a Policyfile.lock.json. The exported repository also contains
36-
a .chef/config.rb which configures #{ChefCLI::Dist::INFRA_CLIENT_PRODUCT} to apply your policy. Once the
36+
a .cinc/config.rb which configures #{ChefCLI::Dist::INFRA_CLIENT_PRODUCT} to apply your policy. Once the
3737
exported repo is copied to the target machine, you can apply the policy to the
3838
machine with:
3939

lib/chef-cli/policyfile_services/export_repo.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ def policy_groups_dir
377377
end
378378

379379
def dot_chef_dir
380-
File.join(export_dir, ".chef")
380+
File.join(export_dir, ".cinc")
381381
end
382382

383383
def policyfile_repo_item_path
@@ -390,7 +390,7 @@ def policy_group_repo_item_path
390390
end
391391

392392
def dot_chef_staging_dir
393-
File.join(staging_dir, ".chef")
393+
File.join(staging_dir, ".cinc")
394394
end
395395

396396
def cookbook_artifacts_staging_dir

lib/chef-cli/skeletons/code_generator/templates/default/repo/gitignore.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
.chef
1313
.chef/*.pem
1414
.chef/encrypted_data_bag_secret
15+
.cinc
16+
.cinc/*.pem
17+
.cinc/encrypted_data_bag_secret
1518
<%- if policy_only -%>
1619
cookbooks/**
1720
!cookbooks/README.md

0 commit comments

Comments
 (0)