summaryrefslogtreecommitdiff
path: root/playground
diff options
context:
space:
mode:
authorSeth Vargo <sethvargo@gmail.com>2013-12-30 13:00:29 -0500
committerSeth Vargo <sethvargo@gmail.com>2013-12-30 13:07:04 -0500
commit16fa20493e37e9cf9c9d5d97aa9b6425c44f9d6d (patch)
tree0fbfa0218eaa87523950a0670ab67a094ede85a7 /playground
parent59baab81f5aa1df4dd29781612db5c183e293b52 (diff)
downloadchef-zero-16fa20493e37e9cf9c9d5d97aa9b6425c44f9d6d.tar.gz
Make playground items more semantic
Diffstat (limited to 'playground')
-rw-r--r--playground/.chef/knife.rb9
-rw-r--r--playground/checksums/54fb547c97dba6cb20343d8a56af7227d6a0a989567af7551a4d9ee8d31893c80
-rw-r--r--playground/checksums/615eca02f4433fcb2b3bdeb7b0050e2485b2ae161f64c4c54b508713a076eb520
-rw-r--r--playground/checksums/7b8dba91d144fd94920d30c4cd5fe01798a2172713ae44adf17a2ee2f10254250
-rw-r--r--playground/checksums/b21d7134123dc093c355621f59da98a4c19e6817b36209e50a90764a5abd22dd0
-rw-r--r--playground/checksums/f6b930d7229704307f8a5d71a594081767c60e71beb3b085af95c99d908438be0
-rw-r--r--playground/cookbooks/apache2/metadata.rb2
-rw-r--r--playground/cookbooks/apache2/recipes/default.rb5
-rw-r--r--playground/cookbooks/apache2/templates/default/site.conf.erb1
-rw-r--r--playground/cookbooks/blah/metadata.rb3
-rw-r--r--playground/cookbooks/blah/recipes/default.rb1
-rw-r--r--playground/cookbooks/blah/templates/default/hi1
-rw-r--r--playground/cookbooks/blork/recipes/default.rb1
-rw-r--r--playground/cookbooks/blork/templates/default/hi1
-rw-r--r--playground/cookbooks/php/metadata.rb3
-rw-r--r--playground/cookbooks/php/recipes/default.rb1
-rw-r--r--playground/data_bags/dns/services.json5
-rw-r--r--playground/data_bags/foo/bar.json1
-rw-r--r--playground/data_bags/foo/baz.json1
-rw-r--r--playground/data_bags/foo/blarghle.json1
-rw-r--r--playground/data_bags/foom/x.json5
-rw-r--r--playground/data_bags/passwords/github.json12
-rw-r--r--playground/data_bags/passwords/twitter.json12
-rw-r--r--playground/data_bags/users/jkeiser.json4
-rw-r--r--playground/data_bags/users/schisamo.json4
-rw-r--r--playground/data_bags/users/sethvargo.json4
-rw-r--r--playground/data_bags/widdle/blank.json1
-rw-r--r--playground/data_bags/widdle/wow.json1
-rw-r--r--playground/environments/desert.json13
-rw-r--r--playground/environments/production.json11
-rw-r--r--playground/environments/rainforest.json13
-rw-r--r--playground/environments/semi_arid_plains.json13
-rw-r--r--playground/environments/staging.json10
-rw-r--r--playground/nodes/desktop.json (renamed from playground/nodes/monkey.json)4
-rw-r--r--playground/nodes/dns.json (renamed from playground/nodes/blah.json)2
-rw-r--r--playground/nodes/lb.json (renamed from playground/nodes/camel.json)4
-rw-r--r--playground/nodes/ldap.json (renamed from playground/nodes/boxer.json)2
-rw-r--r--playground/nodes/www.json (renamed from playground/nodes/blarrrrgh.json)2
38 files changed, 87 insertions, 66 deletions
diff --git a/playground/.chef/knife.rb b/playground/.chef/knife.rb
index d64d8ef..c594c09 100644
--- a/playground/.chef/knife.rb
+++ b/playground/.chef/knife.rb
@@ -1,5 +1,8 @@
chef_repo = File.join(File.dirname(__FILE__), "..")
+
chef_server_url "http://127.0.0.1:4000"
-node_name "stickywicket"
-client_key File.join(File.dirname(__FILE__), "stickywicket.pem")
-cookbook_path "#{chef_repo}/cookbooks"
+node_name "stickywicket"
+client_key File.join(File.dirname(__FILE__), "stickywicket.pem")
+cookbook_path "#{chef_repo}/cookbooks"
+cache_type "BasicFile"
+cache_options :path => "#{chef_repo}/checksums"
diff --git a/playground/checksums/54fb547c97dba6cb20343d8a56af7227d6a0a989567af7551a4d9ee8d31893c8 b/playground/checksums/54fb547c97dba6cb20343d8a56af7227d6a0a989567af7551a4d9ee8d31893c8
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/playground/checksums/54fb547c97dba6cb20343d8a56af7227d6a0a989567af7551a4d9ee8d31893c8
diff --git a/playground/checksums/615eca02f4433fcb2b3bdeb7b0050e2485b2ae161f64c4c54b508713a076eb52 b/playground/checksums/615eca02f4433fcb2b3bdeb7b0050e2485b2ae161f64c4c54b508713a076eb52
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/playground/checksums/615eca02f4433fcb2b3bdeb7b0050e2485b2ae161f64c4c54b508713a076eb52
diff --git a/playground/checksums/7b8dba91d144fd94920d30c4cd5fe01798a2172713ae44adf17a2ee2f1025425 b/playground/checksums/7b8dba91d144fd94920d30c4cd5fe01798a2172713ae44adf17a2ee2f1025425
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/playground/checksums/7b8dba91d144fd94920d30c4cd5fe01798a2172713ae44adf17a2ee2f1025425
diff --git a/playground/checksums/b21d7134123dc093c355621f59da98a4c19e6817b36209e50a90764a5abd22dd b/playground/checksums/b21d7134123dc093c355621f59da98a4c19e6817b36209e50a90764a5abd22dd
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/playground/checksums/b21d7134123dc093c355621f59da98a4c19e6817b36209e50a90764a5abd22dd
diff --git a/playground/checksums/f6b930d7229704307f8a5d71a594081767c60e71beb3b085af95c99d908438be b/playground/checksums/f6b930d7229704307f8a5d71a594081767c60e71beb3b085af95c99d908438be
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/playground/checksums/f6b930d7229704307f8a5d71a594081767c60e71beb3b085af95c99d908438be
diff --git a/playground/cookbooks/apache2/metadata.rb b/playground/cookbooks/apache2/metadata.rb
new file mode 100644
index 0000000..884efc6
--- /dev/null
+++ b/playground/cookbooks/apache2/metadata.rb
@@ -0,0 +1,2 @@
+name 'apache2'
+version '1.0.0'
diff --git a/playground/cookbooks/apache2/recipes/default.rb b/playground/cookbooks/apache2/recipes/default.rb
new file mode 100644
index 0000000..34bcd8a
--- /dev/null
+++ b/playground/cookbooks/apache2/recipes/default.rb
@@ -0,0 +1,5 @@
+package 'apache2'
+
+template '/etc/apache2/sites-enabled' do
+ source 'site.conf.erb'
+end
diff --git a/playground/cookbooks/apache2/templates/default/site.conf.erb b/playground/cookbooks/apache2/templates/default/site.conf.erb
new file mode 100644
index 0000000..e4780b6
--- /dev/null
+++ b/playground/cookbooks/apache2/templates/default/site.conf.erb
@@ -0,0 +1 @@
+# This is just an empty file, but you get the idea
diff --git a/playground/cookbooks/blah/metadata.rb b/playground/cookbooks/blah/metadata.rb
deleted file mode 100644
index a6ca124..0000000
--- a/playground/cookbooks/blah/metadata.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-version "1.5.1"
-
-depends "blork"
diff --git a/playground/cookbooks/blah/recipes/default.rb b/playground/cookbooks/blah/recipes/default.rb
deleted file mode 100644
index 947d931..0000000
--- a/playground/cookbooks/blah/recipes/default.rb
+++ /dev/null
@@ -1 +0,0 @@
-template "/tmp/hii"
diff --git a/playground/cookbooks/blah/templates/default/hi b/playground/cookbooks/blah/templates/default/hi
deleted file mode 100644
index 1937459..0000000
--- a/playground/cookbooks/blah/templates/default/hi
+++ /dev/null
@@ -1 +0,0 @@
-helloooooooooo world
diff --git a/playground/cookbooks/blork/recipes/default.rb b/playground/cookbooks/blork/recipes/default.rb
deleted file mode 100644
index 947d931..0000000
--- a/playground/cookbooks/blork/recipes/default.rb
+++ /dev/null
@@ -1 +0,0 @@
-template "/tmp/hii"
diff --git a/playground/cookbooks/blork/templates/default/hi b/playground/cookbooks/blork/templates/default/hi
deleted file mode 100644
index 12d88af..0000000
--- a/playground/cookbooks/blork/templates/default/hi
+++ /dev/null
@@ -1 +0,0 @@
-hhellooooooo world
diff --git a/playground/cookbooks/php/metadata.rb b/playground/cookbooks/php/metadata.rb
new file mode 100644
index 0000000..536fff4
--- /dev/null
+++ b/playground/cookbooks/php/metadata.rb
@@ -0,0 +1,3 @@
+name 'php'
+version '1.0.0'
+depends 'apache2'
diff --git a/playground/cookbooks/php/recipes/default.rb b/playground/cookbooks/php/recipes/default.rb
new file mode 100644
index 0000000..5ea29a7
--- /dev/null
+++ b/playground/cookbooks/php/recipes/default.rb
@@ -0,0 +1 @@
+package 'php'
diff --git a/playground/data_bags/dns/services.json b/playground/data_bags/dns/services.json
new file mode 100644
index 0000000..f916523
--- /dev/null
+++ b/playground/data_bags/dns/services.json
@@ -0,0 +1,5 @@
+{
+ "id": "services",
+ "payment_gateway": "money.example.com",
+ "authentication": "auth.example.com"
+}
diff --git a/playground/data_bags/foo/bar.json b/playground/data_bags/foo/bar.json
deleted file mode 100644
index 8c90f5a..0000000
--- a/playground/data_bags/foo/bar.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": "bar" }
diff --git a/playground/data_bags/foo/baz.json b/playground/data_bags/foo/baz.json
deleted file mode 100644
index 5419fb9..0000000
--- a/playground/data_bags/foo/baz.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": "baz" }
diff --git a/playground/data_bags/foo/blarghle.json b/playground/data_bags/foo/blarghle.json
deleted file mode 100644
index a93c258..0000000
--- a/playground/data_bags/foo/blarghle.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": "blarghle", "name": "sldfkja" }
diff --git a/playground/data_bags/foom/x.json b/playground/data_bags/foom/x.json
deleted file mode 100644
index e1b7d13..0000000
--- a/playground/data_bags/foom/x.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "id": "x",
- "foo": "barr",
- "wow": "ee"
-}
diff --git a/playground/data_bags/passwords/github.json b/playground/data_bags/passwords/github.json
new file mode 100644
index 0000000..672a410
--- /dev/null
+++ b/playground/data_bags/passwords/github.json
@@ -0,0 +1,12 @@
+{
+ "id": "github",
+ "development": {
+ "token": "ABC123"
+ },
+ "staging": {
+ "token": "DEF456"
+ },
+ "production": {
+ "token": "HIJ789"
+ }
+}
diff --git a/playground/data_bags/passwords/twitter.json b/playground/data_bags/passwords/twitter.json
new file mode 100644
index 0000000..278e2d1
--- /dev/null
+++ b/playground/data_bags/passwords/twitter.json
@@ -0,0 +1,12 @@
+{
+ "id": "twitter",
+ "development": {
+ "api_key": "ABC123"
+ },
+ "staging": {
+ "api_key": "DEF456"
+ },
+ "production": {
+ "api_key": "HIJ789"
+ }
+}
diff --git a/playground/data_bags/users/jkeiser.json b/playground/data_bags/users/jkeiser.json
new file mode 100644
index 0000000..2a9f603
--- /dev/null
+++ b/playground/data_bags/users/jkeiser.json
@@ -0,0 +1,4 @@
+{
+ "id": "jkeiser",
+ "name": "John Keiser"
+}
diff --git a/playground/data_bags/users/schisamo.json b/playground/data_bags/users/schisamo.json
new file mode 100644
index 0000000..744ff82
--- /dev/null
+++ b/playground/data_bags/users/schisamo.json
@@ -0,0 +1,4 @@
+{
+ "id": "schisamo",
+ "name": "Seth Chisamore"
+}
diff --git a/playground/data_bags/users/sethvargo.json b/playground/data_bags/users/sethvargo.json
new file mode 100644
index 0000000..26b2c1e
--- /dev/null
+++ b/playground/data_bags/users/sethvargo.json
@@ -0,0 +1,4 @@
+{
+ "id": "sethvargo",
+ "name": "Seth Vargo"
+}
diff --git a/playground/data_bags/widdle/blank.json b/playground/data_bags/widdle/blank.json
deleted file mode 100644
index 460bafc..0000000
--- a/playground/data_bags/widdle/blank.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": "blank" }
diff --git a/playground/data_bags/widdle/wow.json b/playground/data_bags/widdle/wow.json
deleted file mode 100644
index 7fd3b97..0000000
--- a/playground/data_bags/widdle/wow.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": "wow" }
diff --git a/playground/environments/desert.json b/playground/environments/desert.json
deleted file mode 100644
index dccc695..0000000
--- a/playground/environments/desert.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "name": "desert",
- "default_attributes": {
- },
- "json_class": "Chef::Environment",
- "description": "This is your just desert",
- "cookbook_versions": {
- "bork": "> 2.0"
- },
- "override_attributes": {
- },
- "chef_type": "environment"
-}
diff --git a/playground/environments/production.json b/playground/environments/production.json
new file mode 100644
index 0000000..5b48f8f
--- /dev/null
+++ b/playground/environments/production.json
@@ -0,0 +1,11 @@
+{
+ "name": "production",
+ "description": "This is just production",
+ "json_class": "Chef::Environment",
+ "chef_type": "environment",
+ "cookbook_versions": {
+ "apache": ">= 1.0.0"
+ },
+ "default_attributes": {},
+ "override_attributes": {}
+}
diff --git a/playground/environments/rainforest.json b/playground/environments/rainforest.json
deleted file mode 100644
index 19d173d..0000000
--- a/playground/environments/rainforest.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "name": "rainforest",
- "description": "Aaaaagh! Save me!",
- "cookbook_versions": {
- },
- "json_class": "Chef::Environment",
- "chef_type": "environment",
- "default_attributes": {
- "a": "b"
- },
- "override_attributes": {
- }
-}
diff --git a/playground/environments/semi_arid_plains.json b/playground/environments/semi_arid_plains.json
deleted file mode 100644
index feb8245..0000000
--- a/playground/environments/semi_arid_plains.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "name": "semi_arid_plains",
- "description": "The plains, they are so arid",
- "cookbook_versions": {
- },
- "json_class": "Chef::Environment",
- "chef_type": "environment",
- "default_attributes": {
- "derp": true
- },
- "override_attributes": {
- }
-} \ No newline at end of file
diff --git a/playground/environments/staging.json b/playground/environments/staging.json
new file mode 100644
index 0000000..cd705d0
--- /dev/null
+++ b/playground/environments/staging.json
@@ -0,0 +1,10 @@
+{
+ "name": "staging",
+ "description": "This is just like production, but not",
+ "json_class": "Chef::Environment",
+ "chef_type": "environment",
+ "default_attributes": {
+ "some_key": "value"
+ },
+ "override_attributes": {}
+}
diff --git a/playground/nodes/monkey.json b/playground/nodes/desktop.json
index b61a513..c964e37 100644
--- a/playground/nodes/monkey.json
+++ b/playground/nodes/desktop.json
@@ -1,7 +1,7 @@
{
+ "name": "desktop",
"chef_type": "node",
"json_class": "Chef::Node",
- "name": "monkey",
- "chef_environment": "rainforest",
+ "chef_environment": "staging",
"run_list": []
}
diff --git a/playground/nodes/blah.json b/playground/nodes/dns.json
index 8bcebcc..3465bfb 100644
--- a/playground/nodes/blah.json
+++ b/playground/nodes/dns.json
@@ -1,7 +1,7 @@
{
+ "name": "dns",
"chef_type": "node",
"json_class": "Chef::Node",
- "name": "blah",
"chef_environment": "_default",
"run_list": []
}
diff --git a/playground/nodes/camel.json b/playground/nodes/lb.json
index 2afb91e..c095504 100644
--- a/playground/nodes/camel.json
+++ b/playground/nodes/lb.json
@@ -1,7 +1,7 @@
{
+ "name": "lb",
"chef_type": "node",
"json_class": "Chef::Node",
- "name": "camel",
- "chef_environment": "desert",
+ "chef_environment": "production",
"run_list": []
}
diff --git a/playground/nodes/boxer.json b/playground/nodes/ldap.json
index 8a96dad..766f323 100644
--- a/playground/nodes/boxer.json
+++ b/playground/nodes/ldap.json
@@ -1,7 +1,7 @@
{
+ "name": "ldap",
"chef_type": "node",
"json_class": "Chef::Node",
- "name": "boxer",
"chef_environment": "_default",
"run_list": []
}
diff --git a/playground/nodes/blarrrrgh.json b/playground/nodes/www.json
index 6025af9..179e898 100644
--- a/playground/nodes/blarrrrgh.json
+++ b/playground/nodes/www.json
@@ -1,7 +1,7 @@
{
+ "name": "www",
"chef_type": "node",
"json_class": "Chef::Node",
- "name": "blarrrrgh",
"chef_environment": "_default",
"run_list": []
}