Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 6 commits
  • 33 files changed
  • 0 commit comments
  • 1 contributor
Showing with 201 additions and 88 deletions.
  1. +3 −1 Gemfile
  2. +20 −10 Gemfile.lock
  3. +1 −2 README.md
  4. BIN TheJoyOfCooking.pdf
  5. +0 −28 cooking-with-chef/base.css
  6. +0 −11 cooking-with-chef/showoff.json
  7. +8 −4 {cooking-with-chef → presentation}/01_intro_to_chef/01_intro_to_chef.md
  8. +8 −8 {cooking-with-chef → presentation}/01_intro_to_chef/02_get_started.md
  9. +21 −21 {cooking-with-chef → presentation}/02_provision_for_rails/provision_for_rails.md
  10. +1 −1 {cooking-with-chef → presentation}/03_deploy_with_capistrano/deploy_with_capistrano.md
  11. +4 −2 {cooking-with-chef → presentation}/04_resources_and_reference/resources_and_reference.md
  12. +81 −0 presentation/base.css
  13. 0 {cooking-with-chef → presentation}/description
  14. +32 −0 presentation/fonts.css
  15. 0 {cooking-with-chef → presentation}/images/chef-server-arch.png
  16. 0 {cooking-with-chef → presentation}/images/community_site.jpg
  17. 0 {cooking-with-chef → presentation}/images/cookbook_site.jpg
  18. 0 {cooking-with-chef → presentation}/images/cookbooks.jpg
  19. 0 {cooking-with-chef → presentation}/images/disposable
  20. 0 {cooking-with-chef → presentation}/images/disposable.png
  21. 0 {cooking-with-chef → presentation}/images/edit_node.jpg
  22. BIN presentation/images/foodfight_bw.png
  23. BIN presentation/images/graph.gif
  24. BIN presentation/images/image.jpg
  25. BIN presentation/images/inky-logotype-expanded.png
  26. 0 {cooking-with-chef → presentation}/images/plans_pricing.jpg
  27. 0 {cooking-with-chef → presentation}/images/plugins.jpg
  28. 0 {cooking-with-chef → presentation}/images/test.jpg
  29. BIN presentation/images/twitter_newbird_blue.png
  30. 0 {cooking-with-chef → presentation}/images/vagrant.jpg
  31. BIN rubynation.pptx
  32. +10 −0 showoff.json
  33. +12 −0 style_guide.tpl
View
4 Gemfile
@@ -1,4 +1,6 @@
source 'https://rubygems.org'
-gem "showoff"
gem "chef"
+gem "showoff", :git => "https://github.com/schacon/showoff.git", :ref => "52d064a"
+gem "wkhtmltopdf-binary"
+gem "pdfkit"
View
30 Gemfile.lock
@@ -1,8 +1,20 @@
+GIT
+ remote: https://github.com/schacon/showoff.git
+ revision: 52d064a3c653fb90a9cf6f069ff16f4c76942ce6
+ ref: 52d064a
+ specs:
+ showoff (0.7.0)
+ gli (>= 1.3.2)
+ json
+ nokogiri
+ parslet
+ redcarpet
+ sinatra (~> 1.3)
+
GEM
remote: https://rubygems.org/
specs:
blankslate (2.1.2.4)
- bluecloth (2.2.0)
bunny (0.7.9)
chef (0.10.8)
bunny (>= 0.6.0)
@@ -21,7 +33,7 @@ GEM
treetop (~> 1.4.9)
uuidtools
erubis (2.7.0)
- gli (1.5.1)
+ gli (1.6.0)
highline (1.6.11)
json (1.6.1)
mime-types (1.17.2)
@@ -46,19 +58,14 @@ GEM
yajl-ruby
parslet (1.3.0)
blankslate (~> 2.0)
+ pdfkit (0.5.2)
polyglot (0.3.3)
rack (1.4.1)
rack-protection (1.2.0)
rack
+ redcarpet (2.1.1)
rest-client (1.6.7)
mime-types (>= 1.16)
- showoff (0.7.0)
- bluecloth
- gli (>= 1.3.2)
- json
- nokogiri
- parslet
- sinatra
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
@@ -69,6 +76,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
uuidtools (2.1.2)
+ wkhtmltopdf-binary (0.9.5.3)
yajl-ruby (1.1.0)
PLATFORMS
@@ -76,4 +84,6 @@ PLATFORMS
DEPENDENCIES
chef
- showoff
+ pdfkit
+ showoff!
+ wkhtmltopdf-binary
View
3 README.md
@@ -1,6 +1,5 @@
* `gem install bundler`
* `bundle install`
-* `cd cooking-with-chef`
-* `showoff serve`
+* `bundle exec showoff serve presentation`
The show should now be available at http://localhost:9090
View
BIN TheJoyOfCooking.pdf
Binary file not shown.
View
28 cooking-with-chef/base.css
@@ -1,28 +0,0 @@
-/* Get around style override for margin-top*/
-div.content {
- margin-top: -42px !important;
-}
-
-
-@media screen {
- body {
- font-family: museo-sans,Tahoma,sans-serif;
- color: #54301A;
- background: #f1e3cd;
- }
-}
-
-a:link {color:#ee3524;}
-a:visited {color:#ee3542;}
-a:hover {color:#10a6df;}
-
-
-h1 { background: #F37321; color: white; padding:5px; font-family: Museo Slab; }
-.title-slide h1 { color: #F37321;}
-h2 { color: #F37321; font-family: Museo Slab}
-h3 { color: #F37321; font-family: Museo Slab}
-h4 { color: #F37321; font-family: Museo Slab}
-
-ol li {
- margin-bottom: 0.5em;
-}
View
11 cooking-with-chef/showoff.json
@@ -1,11 +0,0 @@
-{
- "name": "Cooking with Chef",
- "description": "In this tutorial, we'll provide an introduction to Chef with a focus on what you'll need to know to get a Rails application up and running.",
- "author": "@nathenharvey",
- "sections": [
- "01_intro_to_chef",
- "02_provision_for_rails" ,
- "03_deploy_with_capistrano" ,
- "04_resources_and_reference"
- ]
-}
View
12 ...chef/01_intro_to_chef/01_intro_to_chef.md → ...tion/01_intro_to_chef/01_intro_to_chef.md
@@ -57,7 +57,11 @@ from nothing but
* YES - use a systems integration framework
* YES - use one that works for your team
-* YES - this is a talk about **Chef**
+* YES - this is **ChefConf**
+
+* [(Why we chose Chef @CustomInk)](http://technology.customink.com/blog/2011/11/21/why-we-chose-chef-over-puppet-at-customink)
+
+.notes http://technology.customink.com/...
!SLIDE
# Chef #
@@ -329,8 +333,8 @@ The (poorly named) Chef REPL
@@@ ruby
chef > attributes
- chef:attributes > set["shef_example"] = "Hello, rubynation!"
- => "Hello, rubynation!"
+ chef:attributes > set["shef_example"] = "Hello, #ChefConf!"
+ => "Hello, #ChefConf!"
chef:attributes > quit
=> :attributes
@@ -367,7 +371,7 @@ The (poorly named) Chef REPL
# shef
$ cat /tmp/hello
- Hello, rubynation!
+ Hello, #ChefConf!
.notes http://wiki.opscode.com/display/chef/Shef, http://wiki.opscode.com/display/chef/Getting+Started+with+Shef
View
16 ...h-chef/01_intro_to_chef/02_get_started.md → ...tation/01_intro_to_chef/02_get_started.md
@@ -86,8 +86,8 @@ Execute cookbooks that are stored on disk or available at at URL
chef-repo
|-- .chef
| |-- knife.rb
- | |-- rubynation-validator.pem
- | `-- rubynation.pem
+ | |-- chefconf-validator.pem
+ | `-- chefconf.pem
|-- README.md
|-- Rakefile
|-- certificates
@@ -102,7 +102,7 @@ Execute cookbooks that are stored on disk or available at at URL
# Verify setup
$ knife client list
- rubynation-validator
+ chefconf-validator
!SLIDE
# Provision a server
@@ -123,10 +123,10 @@ Execute cookbooks that are stored on disk or available at at URL
config.vm.forward_port 80, 8080
config.vm.provision :chef_client do |chef|
- chef.chef_server_url = "https://api.opscode.com/organizations/rubynation"
- chef.validation_key_path = "chef-repo/.chef/rubynation-validator.pem"
- chef.validation_client_name = "rubynation-validator"
- chef.node_name = "rubynation.local"
+ chef.chef_server_url = "https://api.opscode.com/organizations/chefconf"
+ chef.validation_key_path = "chef-repo/.chef/chefconf-validator.pem"
+ chef.validation_client_name = "chefconf-validator"
+ chef.node_name = "chefconf.local"
end
end
@@ -137,4 +137,4 @@ Execute cookbooks that are stored on disk or available at at URL
READY
$ knife node list
- rubynation.local
+ chefconf.local
View
42 ...rovision_for_rails/provision_for_rails.md → ...rovision_for_rails/provision_for_rails.md
@@ -43,11 +43,11 @@
!SLIDE commandline incremental
# Create a Cookbook #
- $ knife cookbook create rubynation
+ $ knife cookbook create chefconf
- ** Creating cookbook rubynation
- ** Creating README for cookbook: rubynation
- ** Creating metadata for cookbook: rubynation
+ ** Creating cookbook chefconf
+ ** Creating README for cookbook: chefconf
+ ** Creating metadata for cookbook: chefconf
.notes http://wiki.opscode.com/display/chef/Managing+Cookbooks+With+Knife#ManagingCookbooksWithKnife-create
@@ -133,8 +133,8 @@ Create the database user
* Apply roles to nodes
* Our roles:
* base_ubuntu
- * rubynation_web
- * rubynation_db
+ * chefconf_web
+ * chefconf_db
!SLIDE
# base_ubuntu Role
@@ -147,43 +147,43 @@ Create the database user
)
!SLIDE
-# rubynation_web Role
+# chefconf_web Role
@@@ ruby
- name "rubynation_web"
- description "Rubynation Webserver nodes"
+ name "chefconf_web"
+ description "ChefConf Webserver nodes"
run_list(
- "recipe[rubynation::web]"
+ "recipe[chefconf::web]"
)
!SLIDE
-# rubynation_db Role
+# chefconf_db Role
@@@ ruby
- name "rubynation_db"
- description "Rubynation Database nodes"
+ name "chefconf_db"
+ description "ChefConf Database nodes"
run_list(
- "recipe[rubynation::db]"
+ "recipe[chefconf::db]"
)
!SLIDE commandline incremental
# Upload the roles to the server
$ knife role from file roles/base_ubuntu.rb
- $ knife role from file roles/rubynation_web.rb
- $ knife role from file roles/rubynation_db.rb
+ $ knife role from file roles/chefconf_web.rb
+ $ knife role from file roles/chefconf_db.rb
!SLIDE commandline
# Assign the roles to our nodes #
- $ knife node run_list add rubynation.local "role[base_ubuntu]"
- $ knife node run_list add rubynation.local "role[rubynation_web]"
- $ knife node run_list add rubynation.local "role[rubynation_db]"
+ $ knife node run_list add chefconf.local "role[base_ubuntu]"
+ $ knife node run_list add chefconf.local "role[chefconf_web]"
+ $ knife node run_list add chefconf.local "role[chefconf_db]"
-[![edit_node](../images/edit_node.jpg)](https://manage.opscode.com/nodes/rubynation.local/edit)
+[![edit_node](../images/edit_node.jpg)](https://manage.opscode.com/nodes/chefconf.local/edit)
-.notes https://manage.opscode.com/nodes/rubynation.local/edit
+.notes https://manage.opscode.com/nodes/chefconf.local/edit
!SLIDE
# Run chef-client #
View
2 ...with_capistrano/deploy_with_capistrano.md → ...with_capistrano/deploy_with_capistrano.md
@@ -15,7 +15,7 @@ With Chef search
webservers = []
web_query = Chef::Search::Query.new
web_query.search(:node,
- 'role:rubynation_web') do |h|
+ 'role:chefconf_web') do |h|
websevers << h["fqdn"]
end
View
6 ..._and_reference/resources_and_reference.md → ..._and_reference/resources_and_reference.md
@@ -6,6 +6,8 @@
* Lightweight Resources and Providers (LWRP)
* Exception and report handlers
+* Come to the lightning talks tomorrow!
+
!SLIDE
# Want more?
@@ -17,11 +19,11 @@
!SLIDE
# Want even more?
-* [http://foodfightshow.org](http://foodfightshow.org)
+* [http://foodfightshow.org](http://foodfightshow.org) ![foodfight](../images/foodfight_bw.png)
* Episode 5: Getting Started with Chef
* [ChefConf](http://chefconf.opscode.com/) - May 15-17 in San Francisco
-<a href="http://chefconf.opscode.com/"><img title="Attending #ChefConf!" src="http://chefconf.opscode.com/wp-content/uploads/ChefConf-Attending-Banner-1.png" alt="Attending #ChefConf!" width="300" height="250" /></a>
+<a href="http://chefconf.opscode.com/"><img title="Attending #ChefConf!" src="http://chefconf.opscode.com/wp-content/uploads/ChefConf-Attending-Banner-1.png" alt="Attending #ChefConf!" width="300" height="250" /></a> (...and so are you)
.notes http://www.foodfightshow.org/2012/03/episode-5-getting-started-with-chef.html
View
81 presentation/base.css
@@ -0,0 +1,81 @@
+body {
+ font-family: museo-sans, Tahoma, sans-serif;
+ color: #54301A;
+ background: #f1e3cd;
+}
+h1,
+h2,
+h3,
+h4 {
+ font-family: museo-slab;
+}
+
+/*
+* Dirty, dirty hack to turn-off WebFonts when generating a PDF.
+* This works because wkhtmltopdf doesn't respect media queries and will
+* use whatever is last.
+*/
+@media screen and (max-width: 1px) {
+ body,
+ h1,
+ h2,
+ h3,
+ h4 {
+ font-family: Tahoma, sans-serif;
+ }
+}
+
+/* Get around style override for margin-top*/
+.content {
+ margin-top: 0 !important;
+}
+
+a:link,
+a:visited {
+ color:#ee3524;
+}
+a:hover {
+ color:#10a6df;
+}
+
+h1 {
+ background: #F37321;
+ color: white;
+ padding: 5px;
+}
+
+.title-slide h1,
+h2,
+h3,
+h4 {
+ color: #F37321;
+}
+
+ol li {
+ margin-bottom: 0.5em;
+}
+
+#footer {
+ display: none;
+}
+
+footer {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ height: 50px;
+}
+footer .inky {
+ float: left;
+ display: block;
+ margin-left: 15px;
+}
+footer .twitter {
+ float: right;
+ display: block;
+ margin-right: 15px;
+}
+footer .twitter img {
+ vertical-align: middle;
+}
View
0 cooking-with-chef/description → presentation/description
File renamed without changes.
View
32 presentation/fonts.css
32 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
0 ...ing-with-chef/images/chef-server-arch.png → presentation/images/chef-server-arch.png
File renamed without changes
View
0 cooking-with-chef/images/community_site.jpg → presentation/images/community_site.jpg
File renamed without changes
View
0 cooking-with-chef/images/cookbook_site.jpg → presentation/images/cookbook_site.jpg
File renamed without changes
View
0 cooking-with-chef/images/cookbooks.jpg → presentation/images/cookbooks.jpg
File renamed without changes
View
0 cooking-with-chef/images/disposable → presentation/images/disposable
File renamed without changes.
View
0 cooking-with-chef/images/disposable.png → presentation/images/disposable.png
File renamed without changes
View
0 cooking-with-chef/images/edit_node.jpg → presentation/images/edit_node.jpg
File renamed without changes
View
BIN presentation/images/foodfight_bw.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN presentation/images/graph.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN presentation/images/image.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN presentation/images/inky-logotype-expanded.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 cooking-with-chef/images/plans_pricing.jpg → presentation/images/plans_pricing.jpg
File renamed without changes
View
0 cooking-with-chef/images/plugins.jpg → presentation/images/plugins.jpg
File renamed without changes
View
0 cooking-with-chef/images/test.jpg → presentation/images/test.jpg
File renamed without changes
View
BIN presentation/images/twitter_newbird_blue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 cooking-with-chef/images/vagrant.jpg → presentation/images/vagrant.jpg
File renamed without changes
View
BIN rubynation.pptx
Binary file not shown.
View
10 showoff.json
@@ -0,0 +1,10 @@
+{
+ "name": "Cooking with Chef",
+ "description" : "description in in showoff.json",
+ "author" : "@nathenharvey",
+ "twitter" : "@nathenharvey",
+ "templates" : {
+ "default" : "style_guide.tpl"
+ },
+ "section" : "presentation"
+}
View
12 style_guide.tpl
@@ -0,0 +1,12 @@
+<div>
+ ~~~CONTENT~~~
+</div>
+<footer>
+ <span class="inky">
+ <img src="/image/images/inky-logotype-expanded.png" width="168" height="40"/>
+ </span>
+ <span class="twitter">
+ <img src="/image/images/twitter_newbird_blue.png" width="51" height="50"/>
+ ~~~CONFIG:twitter~~~
+ </span>
+</footer>

No commit comments for this range

Something went wrong with that request. Please try again.