Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleaning up cruft from old releases and clarifying examples/readmes

  • Loading branch information...
commit 8825e731013ebe4d5cd4c90dd42e8e39864a70f1 1 parent 2594ccc
@jtimberman jtimberman authored
View
1  Rakefile
@@ -63,4 +63,3 @@ task :bundle_cookbook, :cookbook do |t, args|
FileUtils.rm_rf temp_dir
end
-
View
5 certificates/README
@@ -1,3 +1,6 @@
Creating SSL certificates is a common task done in web application
infrastructures, so a rake task is provided to generate certificates.
-These certificates are stored here by the ssl_cert task.
+These certificates are stored here by the ssl_cert task. To generate a
+certificate set for a new monitoring server, for example:
+
+ rake ssl_cert FQDN=monitoring.example.com
View
16 config/client.rb.example
@@ -1,21 +1,15 @@
#
# Example Chef Client Config File
#
-# Use Opscode's chef cookbook for managing chef itself,
-# instead of using this file. It is provided as an example.
+# You can generate the client.rb with correct settings with knife:
+#
+# knife configure client ./config
log_level :info
log_location STDOUT
ssl_verify_mode :verify_none
-chef_server_url "http://chef.example.com:4000"
+chef_server_url "https://api.opscode.com/organizations/ORGNAME"
-validation_client_name "chef-validator"
-validation_key "/etc/chef/validation.pem"
client_key "/etc/chef/client.pem"
-file_store_path "/srv/chef/file_store"
-file_cache_path "/srv/chef/cache"
-
-pid_file "/var/run/chef/chef-client.pid"
-
-Mixlib::Log::Formatter.show_time = true
+validation_client_name "ORGNAME-validator"
View
24 config/knife.rb.example
@@ -1,12 +1,18 @@
-# This file provided as an example. Run 'knife configure' to generate a
-# config file for your local user.
+# This file is provided as an example when using the Opscode Platform
+# as the Chef Server. You were prompted to download a config file
+# when you signed up for the Opscode Platform that looks like this.
+#
+# Replace USERNAME with your Opscode username and ORGNAME
+# with your Opscode Platform organization name.
+#
+current_dir = File.dirname(__FILE__)
log_level :info
log_location STDOUT
-node_name 'chef_admin'
-client_key '/home/chef_admin/.chef/chef_admin.pem'
-validation_client_name 'chef-validator'
-validation_key '/home/chef_admin/.chef/chef-validator.pem'
-chef_server_url 'http://chef.example.com:4000'
+node_name "USERNAME"
+client_key "#{current_dir}/USERNAME.pem"
+validation_client_name "ORGANIZATION-validator"
+validation_key "#{current_dir}/ORGANIZATION-validator.pem"
+chef_server_url "https://api.opscode.com/organizations/ORGANIZATION"
cache_type 'BasicFile'
-cache_options( :path => '/home/chef_admin/.chef/checksums' )
-cookbook_path [ './cookbooks', './site-cookbooks' ]
+cache_options( :path => "#{ENV['HOME']}/.chef/checksums" )
+cookbook_path ["#{current_dir}/../cookbooks"]
View
28 config/rake.rb
@@ -1,5 +1,8 @@
+# Configure the Rakefile's tasks.
+
###
# Company and SSL Details
+# Used with the ssl_cert task.
###
# The company name - used for SSL certificates, and in srvious other places
@@ -24,28 +27,6 @@
# Can be :apachev2 or :none
NEW_COOKBOOK_LICENSE = :apachev2
-##########################
-# Chef Repository Layout #
-##########################
-
-# Where to install upstream cookbooks for serving
-COOKBOOK_PATH = "/srv/chef/cookbooks"
-
-# Where to install site-local modifications to upstream cookbooks
-SITE_COOKBOOK_PATH = "/srv/chef/site-cookbooks"
-
-# Where to install roles
-ROLE_PATH = "/srv/chef/roles"
-
-# Chef Config Path
-CHEF_CONFIG_PATH = "/etc/chef"
-
-# The location of the Chef Server Config file (on the server)
-CHEF_SERVER_CONFIG = File.join(CHEF_CONFIG_PATH, "server.rb")
-
-# The location of the Chef Client Config file (on the client)
-CHEF_CLIENT_CONFIG = File.join(CHEF_CONFIG_PATH, "client.rb")
-
###
# Useful Extras (which you probably don't need to change)
###
@@ -55,6 +36,3 @@
# Where to store certificates generated with ssl_cert
CADIR = File.expand_path(File.join(TOPDIR, "certificates"))
-
-# Where to store the mtime cache for the recipe/template syntax check
-TEST_CACHE = File.expand_path(File.join(TOPDIR, ".rake_test_cache"))
View
42 config/server.rb.example
@@ -1,42 +0,0 @@
-#
-# Chef Server Config File
-#
-# Use Opscode's chef cookbook for managing chef itself,
-# instead of using this file. It is provided as an example.
-
-log_level :info
-log_location STDOUT
-ssl_verify_mode :verify_none
-chef_server_url "http://chef.example.com:4000"
-
-signing_ca_path "/srv/chef/ca"
-couchdb_database 'chef'
-
-cookbook_path [ "/srv/chef/cookbooks", "/srv/chef/site-cookbooks" ]
-
-file_cache_path "/srv/chef/cache"
-node_path "/srv/chef/nodes"
-openid_store_path "/srv/chef/openid/store"
-openid_cstore_path "/srv/chef/openid/cstore"
-search_index_path "/srv/chef/search_index"
-role_path "/srv/chef/roles"
-
-validation_client_name "chef-validator"
-validation_key "/etc/chef/validation.pem"
-client_key "/etc/chef/client.pem"
-web_ui_client_name "chef-webui"
-web_ui_key "/etc/chef/webui.pem"
-
-# change this as required.
-#web_ui_admin_user_name "admin"
-#web_ui_admin_default_password "replace_with_something_secure"
-
-supportdir = "/srv/chef/support"
-solr_jetty_path File.join(supportdir, "solr", "jetty")
-solr_data_path File.join(supportdir, "solr", "data")
-solr_home_path File.join(supportdir, "solr", "home")
-solr_heap_size "256M"
-
-umask 0022
-
-Mixlib::Log::Formatter.show_time = false
View
3  config/solo.rb.example
@@ -1,6 +1,7 @@
#
# Chef Solo Config File
#
+# This file is provided as an example of /etc/chef/solo.rb.
log_level :info
log_location STDOUT
@@ -9,5 +10,3 @@ file_cache_path "/var/chef/cookbooks"
# Optionally store your JSON data file and a tarball of cookbooks remotely.
#json_attribs "http://chef.example.com/dna.json"
#recipe_url "http://chef.example.com/cookbooks.tar.gz"
-
-Mixlib::Log::Formatter.show_time = false
View
3  cookbooks/README
@@ -1 +1,2 @@
-Remove this file to clone an upstream git repository of cookbooks
+Download cookbooks into this directory from the Opscode Cookbooks site
+using knife, or remove this file to clone an upstream Git Repository.
Please sign in to comment.
Something went wrong with that request. Please try again.