Merge branch 'master' of github.com:diaspora/diaspora

chef/cookbooks/bootstrap/bootstrap.json

@@ -1 +0,0 @@
-{"recipes": ["bootstrap::default" ] } 

chef/cookbooks/centos/bootstrap.json

@@ -0,0 +1 @@
+{"recipes": ["centos::bootstrap" ] } 

chef/cookbooks/centos/files/default/10gen.repo

@@ -0,0 +1,5 @@
+[10gen]
+name=10gen Repository
+baseurl=http://downloads.mongodb.org/distros/centos/5.4/os/x86_64/
+gpgcheck=0
+

chef/cookbooks/centos/main.json

@@ -0,0 +1 @@
+{"recipes": ["centos::main" ] } 

chef/cookbooks/centos/recipes/image_magick.rb

@@ -0,0 +1,3 @@
+execute "install ImageMagick" do
+  command "yum install -y ImageMagick"
+end

chef/cookbooks/centos/recipes/main.rb

@@ -0,0 +1,6 @@
+execute "say hello" do
+  command "echo welcome to diaspora chef"
+end
+
+include_recipe "centos::image_magick"
+include_recipe "centos::mongo_db"

chef/cookbooks/centos/recipes/mongo_db.rb

@@ -0,0 +1,11 @@
+cookbook_file "/etc/yum.repos.d/10gen.repo" do
+  source "10gen.repo"
+end
+
+execute "refresh yum" do
+  command "yum update -y"
+end
+
+execute "install mongo" do
+  command "yum install -y mongo-stable"
+end

chef/cookbooks/main/main.json

@@ -1 +0,0 @@
-{"recipes": ["main::default" ] } 

chef/cookbooks/main/recipes/default.rb

@@ -1,3 +0,0 @@
-execute "say hello" do
-  command "echo welcome to diaspora chef"
-end