renaming mongodb to mongodb-debs to not cause confusion with the opsc…

…ode cookbook - that installs from sources
mdxp · Sep 16, 2010 · 9e02dc5 · 9e02dc5
1 parent adefa9f
commit 9e02dc5
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 98 deletions.
diff --git a/diaspora/README.rdoc b/diaspora/README.rdoc
@@ -1,8 +1,44 @@
 = DESCRIPTION:
 
+Installs diaspora based on the instructions from http://github.com/diaspora/diaspora
+It will install also mongodb from debian/ubuntu packages like:
+http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages
+
 = REQUIREMENTS:
 
-= ATTRIBUTES: 
+== Platform:
+
+Tested on Ubuntu 10.04, Debian Lenny.
+
+== Cookbooks:
+
+Opscode cookbooks (http://github.com/opscode/cookbooks/tree/master)
+
+* build-essential
+* git
+* imagemagick
+* xml
 
 = USAGE:
 
+Include the diaspora recipe to install diaspora on your system:
+
+  include_recipe "diaspora"
+
+= LICENSE and AUTHOR:
+
+Author:: Marius Ducea ([email protected])
+
+Copyright:: 2010, Promet Solutions
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/diaspora/metadata.json b/diaspora/metadata.json
diff --git a/diaspora/metadata.rb b/diaspora/metadata.rb
@@ -5,7 +5,7 @@
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
 version          "0.1"
 
-%w{ xml imagemagick git build-essential mongodb }.each do |cb|
+%w{ xml imagemagick git build-essential mongodb-debs }.each do |cb|
   depends cb
 end
 %w{ ubuntu debian }.each do |os|

diff --git a/diaspora/recipes/default.rb b/diaspora/recipes/default.rb
@@ -22,7 +22,7 @@
 include_recipe "xml"
 include_recipe "imagemagick"
 include_recipe "git"
-include_recipe "mongodb"
+include_recipe "mongodb-debs"
 
 gem_package "bundler"
 package "libxslt1-dev"

diff --git a/mongodb-debs/README.rdoc b/mongodb-debs/README.rdoc
@@ -0,0 +1,34 @@
+= DESCRIPTION:
+
+Installs mongodb from debian pacakges based on the instructions from
+http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages
+
+= REQUIREMENTS:
+
+== Platform:
+
+Tested on Ubuntu 10.04, Debian Lenny.
+
+= USAGE:
+
+Include the mongodb-debs recipe to install mongodb on your system:
+
+  include_recipe "mongodb-debs"
+
+= LICENSE and AUTHOR:
+
+Author:: Marius Ducea ([email protected])
+
+Copyright:: 2010, Promet Solutions
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/mongodb/metadata.rb → mongodb-debs/metadata.rb b/mongodb/metadata.rb → mongodb-debs/metadata.rb
@@ -3,7 +3,7 @@
 license          "Apache 2.0"
 description      "Installs MongoDB"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version          "0.1"
+version          "0.2.0"
 
 %w{ ubuntu debian }.each do |os|
   supports os

diff --git a/mongodb/recipes/default.rb → mongodb-debs/recipes/default.rb b/mongodb/recipes/default.rb → mongodb-debs/recipes/default.rb
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-include_recipe "mongodb::repo"
+include_recipe "mongodb-debs::repo"
 
 package "mongodb-stable"
 

diff --git a/mongodb/recipes/repo.rb → mongodb-debs/recipes/repo.rb b/mongodb/recipes/repo.rb → mongodb-debs/recipes/repo.rb
diff --git a/mongodb/templates/debian/mongodb.list.erb → ...db-debs/templates/debian/mongodb.list.erb b/mongodb/templates/debian/mongodb.list.erb → ...db-debs/templates/debian/mongodb.list.erb
diff --git a/mongodb/templates/default/mongodb.conf.erb → ...b-debs/templates/default/mongodb.conf.erb b/mongodb/templates/default/mongodb.conf.erb → ...b-debs/templates/default/mongodb.conf.erb
diff --git a/mongodb/templates/default/mongodb.list.erb → ...b-debs/templates/default/mongodb.list.erb b/mongodb/templates/default/mongodb.list.erb → ...b-debs/templates/default/mongodb.list.erb
diff --git a/...b/templates/ubuntu-10.04/mongodb.list.erb → ...s/templates/ubuntu-10.04/mongodb.list.erb b/...b/templates/ubuntu-10.04/mongodb.list.erb → ...s/templates/ubuntu-10.04/mongodb.list.erb
diff --git a/...db/templates/ubuntu-9.04/mongodb.list.erb → ...bs/templates/ubuntu-9.04/mongodb.list.erb b/...db/templates/ubuntu-9.04/mongodb.list.erb → ...bs/templates/ubuntu-9.04/mongodb.list.erb
diff --git a/...db/templates/ubuntu-9.10/mongodb.list.erb → ...bs/templates/ubuntu-9.10/mongodb.list.erb b/...db/templates/ubuntu-9.10/mongodb.list.erb → ...bs/templates/ubuntu-9.10/mongodb.list.erb
diff --git a/mongodb/README.rdoc b/mongodb/README.rdoc
diff --git a/mongodb/metadata.json b/mongodb/metadata.json