From aa63d35cd37bb491958326ea54816f135b383a18 Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Wed, 18 Feb 2015 17:36:27 -0500 Subject: [PATCH] opscode2chef --- Berksfile | 2 +- CHANGELOG.md | 4 +- CONTRIBUTING.md | 54 +++++++++---------- README.md | 14 ++--- metadata.rb | 4 +- providers/manage.rb | 2 +- recipes/default.rb | 2 +- recipes/sysadmins.rb | 2 +- .../fixtures/cookbooks/users_test/metadata.rb | 4 +- 9 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Berksfile b/Berksfile index b98db335..ca99cc43 100644 --- a/Berksfile +++ b/Berksfile @@ -1,5 +1,5 @@ # Berkshelf 3.0 -source 'http://api.berkshelf.com' +source 'https://supermarket.chef.io' metadata cookbook 'users_test', path: 'test/fixtures/cookbooks/users_test' diff --git a/CHANGELOG.md b/CHANGELOG.md index b66c6c19..82221314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,13 +13,13 @@ v1.7.0 (2014-02-14) v1.6.0 ------ ### Bug -- **[COOK-3744](https://tickets.opscode.com/browse/COOK-3744)** - Allow passing an action option via the `data_bag` to the user resource +- **[COOK-3744](https://tickets.chef.io/browse/COOK-3744)** - Allow passing an action option via the `data_bag` to the user resource v1.5.2 ------ ### Bug -- **[COOK-3215](https://tickets.opscode.com/browse/COOK-3215)** - Make `group_id` optional +- **[COOK-3215](https://tickets.chef.io/browse/COOK-3215)** - Make `group_id` optional v1.5.0 ------ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a998978..67d6eb9f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,23 +1,23 @@ -# Contributing to Opscode Cookbooks +# Contributing to Chef Software Cookbooks -We are glad you want to contribute to Opscode Cookbooks! The first +We are glad you want to contribute to Chef Software Cookbooks! The first step is the desire to improve the project. You can find the answers to additional frequently asked questions -[on the wiki](http://wiki.opscode.com/display/chef/How+to+Contribute). +[on the wiki](http://wiki.chef.io/display/chef/How+to+Contribute). You can find additional information about -[contributing to cookbooks](http://wiki.opscode.com/display/chef/How+to+Contribute+to+Opscode+Cookbooks) +[contributing to cookbooks](http://wiki.chef.io/display/chef/How+to+Contribute+to+Chef+Cookbooks) on the wiki as well. ## Quick-contribute -* Create an account on our [bug tracker](http://tickets.opscode.com) +* Create an account on our [bug tracker](http://tickets.chef.io) * Sign our contributor agreement (CLA) [ online](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L) (keep reading if you're contributing on behalf of your employer) * Create a ticket for your change on the - [bug tracker](http://tickets.opscode.com) + [bug tracker](http://tickets.chef.io) * Link to your patch as a rebased git branch or pull request from the ticket * Resolve the ticket as fixed @@ -39,7 +39,7 @@ understands what rights they are licensing and agrees to them. Sometimes the copyright holder isn't the contributor, most often when the contributor is doing work for a company. -To make a good faith effort to ensure these criteria are met, Opscode +To make a good faith effort to ensure these criteria are met, Chef requires a Contributor License Agreement (CLA) or a Corporate Contributor License Agreement (CCLA) for all contributions. This is without exception due to some matters not being related to copyright @@ -58,7 +58,7 @@ instead. ## Ticket Tracker (JIRA) -The [ticket tracker](http://tickets.opscode.com) is the most important +The [ticket tracker](http://tickets.chef.io) is the most important documentation for the code base. It provides significant historical information, such as: @@ -72,7 +72,7 @@ Each ticket should aim to fix one bug or add one feature. You can get a quick copy of the repository for this cookbook by running `git clone -git://github.com/opscode-coobkooks/COOKBOOKNAME.git`. +git://github.com/chef-coobkooks/COOKBOOKNAME.git`. For collaboration purposes, it is best if you create a Github account and fork the repository to your own account. Once you do this you will @@ -109,8 +109,8 @@ to them. ### Github and Pull Requests -All of Opscode's open source cookbook projects are available on -[Github](http://www.github.com/opscode-cookbooks). +All of Chef's open source cookbook projects are available on +[Github](http://www.github.com/chef-cookbooks). We don't require you to use Github, and we will even take patch diffs attached to tickets on the tracker. However Github has a lot of @@ -127,18 +127,18 @@ reply from the author for various reasons. ### More information Additional help with git is available on the -[Working with Git](http://wiki.opscode.com/display/chef/Working+with+Git) +[Working with Git](http://wiki.chef.io/display/chef/Working+with+Git) wiki page. ## Functional and Unit Tests This cookbook is set up to run tests under -[Opscode's test-kitchen](https://github.com/opscode/test-kitchen). It +[Chef's test-kitchen](https://github.com/chef/test-kitchen). It uses minitest-chef to run integration tests after the node has been converged to verify that the state of the node. Test kitchen should run completely without exception using the default -[baseboxes provided by Opscode](https://github.com/opscode/bento). +[baseboxes provided by Chef](https://github.com/chef/bento). Because Test Kitchen creates VirtualBox machines and runs through every configuration in the Kitchenfile, it may take some time for these tests to complete. @@ -168,7 +168,7 @@ mailing list, or the #chef-hacking IRC channel. ## Code Review -Opscode regularly reviews code contributions and provides suggestions +Chef Software regularly reviews code contributions and provides suggestions for improvement in the code itself or the implementation. We find contributions by searching the ticket tracker for _resolved_ @@ -183,7 +183,7 @@ or two, depending on the current release cycle. ## Release Cycle -The versioning for Opscode Cookbook projects is X.Y.Z. +The versioning for Chef Software Cookbook projects is X.Y.Z. * X is a major release, which may not be fully compatible with prior major releases @@ -196,31 +196,31 @@ cookbook begins, the "Z" patch number is incremented to the next odd number, however the next release of the cookbook may be a major or minor incrementing version. -Releases of Opscode's cookbooks are usually announced on the Chef user +Releases of Chef's cookbooks are usually announced on the Chef user mailing list. Releases of several cookbooks may be batched together -and announced on the [Opscode Blog](http://www.opscode.com/blog). +and announced on the [Chef Software Blog](http://www.chef.io/blog). ## Working with the community These resources will help you learn more about Chef and connect to other members of the Chef community: -* [chef](http://lists.opscode.com/sympa/info/chef) and - [chef-dev](http://lists.opscode.com/sympa/info/chef-dev) mailing +* [chef](http://lists.chef.io/sympa/info/chef) and + [chef-dev](http://lists.chef.io/sympa/info/chef-dev) mailing lists * #chef and #chef-hacking IRC channels on irc.freenode.net -* [Community Cookbook site](http://community.opscode.com) -* [Chef wiki](http://wiki.opscode.com/display/chef) -* Opscode Chef [product page](http://www.opscode.com/chef) +* [Community Cookbook site](http://community.chef.io) +* [Chef wiki](http://wiki.chef.io/display/chef) +* Chef Software Chef [product page](http://www.chef.io/chef) ## Cookbook Contribution Do's and Don't's Please do include tests for your contribution. If you need help, ask on the -[chef-dev mailing list](http://lists.opscode.com/sympa/info/chef-dev) +[chef-dev mailing list](http://lists.chef.io/sympa/info/chef-dev) or the -[#chef-hacking IRC channel](http://community.opscode.com/chat/chef-hacking). +[#chef-hacking IRC channel](http://community.chef.io/chat/chef-hacking). Not all platforms that a cookbook supports may be supported by Test Kitchen. Please provide evidence of testing your contribution if it isn't trivial so we don't have to duplicate effort in testing. Chef @@ -247,11 +247,11 @@ Please do ensure that your changes do not break or modify behavior for other platforms supported by the cookbook. For example if your changes are for Debian, make sure that they do not break on CentOS. -Please do not modify the version number in the metadata.rb, Opscode +Please do not modify the version number in the metadata.rb, Chef will select the appropriate version based on the release cycle information above. Please do not update the CHANGELOG.md for a new version. Not all changes to a cookbook may be merged and released in the same versions. -Opscode will update the CHANGELOG.md when releasing a new version of +Chef Software will update the CHANGELOG.md when releasing a new version of the cookbook. diff --git a/README.md b/README.md index e83abd8c..0cefcab0 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ $ knife data bag create users Create a user in the data_bag/users/ directory. -When using an [Omnibus ruby](http://tickets.opscode.com/browse/CHEF-2848), one can specify an optional password hash. This will be used as the user's password. +When using an [Omnibus ruby](http://tickets.chef.io/browse/CHEF-2848), one can specify an optional password hash. This will be used as the user's password. The hash can be generated with the following command. @@ -73,7 +73,7 @@ Note: The ssh_keys attribute below can be either a String or an Array. However, } ``` -You can pass any action listed in the [user](http://docs.opscode.com/chef/resources.html#user) resource for Chef via the "action" option. For Example: +You can pass any action listed in the [user](http://docs.chef.io/chef/resources.html#user) resource for Chef via the "action" option. For Example: Lock a user, johndoe1. @@ -157,11 +157,11 @@ $EDITOR data_bags/users/bofh.json Paste the user's public SSH key into the ssh_keys value. Also make sure the uid is unique, and if you're not using bash, that the shell is installed. The default search, and Unix group is sysadmin. -The recipe, by default, will also create the sysadmin group. If you're using the opscode sudo cookbook, they'll have sudo access in the default site-cookbooks template. They won't have passwords though, so the sudo cookbook's template needs to be adjusted so the sysadmin group has NOPASSWD. +The recipe, by default, will also create the sysadmin group. If you're using the chef sudo cookbook, they'll have sudo access in the default site-cookbooks template. They won't have passwords though, so the sudo cookbook's template needs to be adjusted so the sysadmin group has NOPASSWD. The sysadmin group will be created with GID 2300. This may become an attribute at a later date. -The Apache cookbook can set up authentication using OpenIDs, which is set up using the openid key here. See the Opscode 'apache2' cookbook for more information about this. +The Apache cookbook can set up authentication using OpenIDs, which is set up using the openid key here. See the Chef Software 'apache2' cookbook for more information about this. Chef Solo @@ -171,11 +171,11 @@ As of version 1.4.0, this cookbook might work with Chef Solo when using [chef-so License & Authors ----------------- -- Author:: Joshua Timberman () -- Author:: Seth Chisamore () +- Author:: Joshua Timberman () +- Author:: Seth Chisamore () ```text -Copyright:: 2009-2013, Opscode, Inc +Copyright:: 2009-2013, 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/metadata.rb b/metadata.rb index af307547..c1d3ad07 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,6 +1,6 @@ name "users" -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" +maintainer "Chef Software, Inc." +maintainer_email "cookbooks@chef.io" license "Apache 2.0" description "Creates users from a databag search" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) diff --git a/providers/manage.rb b/providers/manage.rb index 56f5413f..2132549f 100644 --- a/providers/manage.rb +++ b/providers/manage.rb @@ -3,7 +3,7 @@ # Provider:: manage # # Copyright 2011, Eric G. Wolfe -# Copyright 2009-2011, Opscode, Inc. +# Copyright 2009-2011, 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/recipes/default.rb b/recipes/default.rb index 77c8d233..7c4e78d0 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -2,7 +2,7 @@ # Cookbook Name:: users # Recipe:: default # -# Copyright 2009-2012, Opscode, Inc. +# Copyright 2009-2012, 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/recipes/sysadmins.rb b/recipes/sysadmins.rb index d3b8d0a3..8e650534 100644 --- a/recipes/sysadmins.rb +++ b/recipes/sysadmins.rb @@ -3,7 +3,7 @@ # Recipe:: sysadmins # # Copyright 2011, Eric G. Wolfe -# Copyright 2009-2011, Opscode, Inc. +# Copyright 2009-2011, 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/test/fixtures/cookbooks/users_test/metadata.rb b/test/fixtures/cookbooks/users_test/metadata.rb index ad0a483b..88866639 100644 --- a/test/fixtures/cookbooks/users_test/metadata.rb +++ b/test/fixtures/cookbooks/users_test/metadata.rb @@ -1,6 +1,6 @@ name 'users_test' -maintainer 'Opscode, Inc.' -maintainer_email 'cookbooks@opscode.com' +maintainer 'Chef Software, Inc.' +maintainer_email 'cookbooks@chef.io' license 'Apache 2.0' description 'Creates users from a databag search' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))