Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Cleaning up cruft from old releases and clarifying examples/readmes

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

0 notes on commit 8825e73

Please sign in to comment.
Something went wrong with that request. Please try again.