Merge branch 'chore/default_license' of kosmos/chef into master

Move the generate options to config.rb at the root of the repo
This has been the only way I managed to make `chef generate cookbook COOKBOOK_NAME` set the default values This is not documented, there is an issue open about it: https://github.com/chef/chef-cli/issues/54
2019-12-27 15:32:10 +00:00 · 2019-12-27 11:33:05 +01:00 · 2019-12-18 20:19:42 +01:00
2 changed files with 4 additions and 4 deletions
--- a/.chef/config.rb
+++ b/.chef/config.rb
@ -8,10 +8,6 @@ data_bag_path             "data_bags"
 encrypted_data_bag_secret "#{current_dir}/encrypted_data_bag_secret"
 local_mode                true # Chef local mode, replacing Solo

-cookbook_copyright     'Kosmos'
-cookbook_license       'none'
-cookbook_email         'mail@kosmos.org'
-
 # Knife-Zero config, see https://knife-zero.github.io/40_configuration/
 # Prevent attributes from being saved to the node files
 knife[:automatic_attribute_whitelist] = %w[
--- a/config.rb
+++ b/config.rb
@ -0,0 +1,4 @@
+# Set default values for `chef generate cookbook COOKBOOK_NAME`
+chefdk.generator.copyright_holder 'Kosmos Developers'
+chefdk.generator.license          'mit'
+chefdk.generator.email            'mail@kosmos.org'
Author	SHA1	Message	Date
gregkare	484f1306da	Merge branch 'chore/default_license' of kosmos/chef into master	2019-12-27 15:32:10 +00:00
Greg Karékinian	d029ee91be	Move the generate options to config.rb at the root of the repo This has been the only way I managed to make `chef generate cookbook COOKBOOK_NAME` set the default values This is not documented, there is an issue open about it: https://github.com/chef/chef-cli/issues/54	2019-12-27 11:33:05 +01:00
Sebastian Kippe	8d78d41af7	Use MIT as default cookbook license And improve the author name, making it more consistent with the rest of the repo.	2019-12-18 20:19:42 +01:00