From 9e02dc54010754efdd59d0b4867c4eba7d544995 Mon Sep 17 00:00:00 2001 From: Marius Ducea Date: Thu, 16 Sep 2010 10:06:00 -0700 Subject: [PATCH] renaming mongodb to mongodb-debs to not cause confusion with the opscode cookbook - that installs from sources --- diaspora/README.rdoc | 38 +++++++++++++- diaspora/metadata.json | 50 ------------------- diaspora/metadata.rb | 2 +- diaspora/recipes/default.rb | 2 +- mongodb-debs/README.rdoc | 34 +++++++++++++ {mongodb => mongodb-debs}/metadata.rb | 2 +- {mongodb => mongodb-debs}/recipes/default.rb | 2 +- {mongodb => mongodb-debs}/recipes/repo.rb | 0 .../templates/debian/mongodb.list.erb | 0 .../templates/default/mongodb.conf.erb | 0 .../templates/default/mongodb.list.erb | 0 .../templates/ubuntu-10.04/mongodb.list.erb | 0 .../templates/ubuntu-9.04/mongodb.list.erb | 0 .../templates/ubuntu-9.10/mongodb.list.erb | 0 mongodb/README.rdoc | 8 --- mongodb/metadata.json | 35 ------------- 16 files changed, 75 insertions(+), 98 deletions(-) delete mode 100644 diaspora/metadata.json create mode 100644 mongodb-debs/README.rdoc rename {mongodb => mongodb-debs}/metadata.rb (91%) rename {mongodb => mongodb-debs}/recipes/default.rb (96%) rename {mongodb => mongodb-debs}/recipes/repo.rb (100%) rename {mongodb => mongodb-debs}/templates/debian/mongodb.list.erb (100%) rename {mongodb => mongodb-debs}/templates/default/mongodb.conf.erb (100%) rename {mongodb => mongodb-debs}/templates/default/mongodb.list.erb (100%) rename {mongodb => mongodb-debs}/templates/ubuntu-10.04/mongodb.list.erb (100%) rename {mongodb => mongodb-debs}/templates/ubuntu-9.04/mongodb.list.erb (100%) rename {mongodb => mongodb-debs}/templates/ubuntu-9.10/mongodb.list.erb (100%) delete mode 100644 mongodb/README.rdoc delete mode 100644 mongodb/metadata.json diff --git a/diaspora/README.rdoc b/diaspora/README.rdoc index 8d77480..8bed2db 100644 --- 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 (marius@promethost.com) + +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 deleted file mode 100644 index cf67b79..0000000 --- a/diaspora/metadata.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "recipes": { - }, - "replacing": { - }, - "attributes": { - }, - "maintainer_email": "marius@promethost.com", - "groupings": { - }, - "dependencies": { - "mongodb": [ - - ], - "xml": [ - - ], - "git": [ - - ], - "imagemagick": [ - - ], - "build-essential": [ - - ] - }, - "recommendations": { - }, - "long_description": "= DESCRIPTION:\n\n= REQUIREMENTS:\n\n= ATTRIBUTES: \n\n= USAGE:\n\n", - "suggestions": { - }, - "platforms": { - "debian": [ - - ], - "ubuntu": [ - - ] - }, - "license": "Apache 2.0", - "version": "0.1.0", - "conflicting": { - }, - "name": "diaspora", - "providing": { - }, - "description": "Installs/Configures diaspora", - "maintainer": "Promet Solutions" - } \ No newline at end of file diff --git a/diaspora/metadata.rb b/diaspora/metadata.rb index 87d899b..c27b773 100644 --- 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 index 4999acd..31d864d 100644 --- 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 new file mode 100644 index 0000000..ed19c5e --- /dev/null +++ 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 (marius@promethost.com) + +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 b/mongodb-debs/metadata.rb similarity index 91% rename from mongodb/metadata.rb rename to mongodb-debs/metadata.rb index 34b382d..3cad160 100644 --- a/mongodb/metadata.rb +++ b/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 b/mongodb-debs/recipes/default.rb similarity index 96% rename from mongodb/recipes/default.rb rename to mongodb-debs/recipes/default.rb index e131f02..53bf117 100644 --- a/mongodb/recipes/default.rb +++ b/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 b/mongodb-debs/recipes/repo.rb similarity index 100% rename from mongodb/recipes/repo.rb rename to mongodb-debs/recipes/repo.rb diff --git a/mongodb/templates/debian/mongodb.list.erb b/mongodb-debs/templates/debian/mongodb.list.erb similarity index 100% rename from mongodb/templates/debian/mongodb.list.erb rename to mongodb-debs/templates/debian/mongodb.list.erb diff --git a/mongodb/templates/default/mongodb.conf.erb b/mongodb-debs/templates/default/mongodb.conf.erb similarity index 100% rename from mongodb/templates/default/mongodb.conf.erb rename to mongodb-debs/templates/default/mongodb.conf.erb diff --git a/mongodb/templates/default/mongodb.list.erb b/mongodb-debs/templates/default/mongodb.list.erb similarity index 100% rename from mongodb/templates/default/mongodb.list.erb rename to mongodb-debs/templates/default/mongodb.list.erb diff --git a/mongodb/templates/ubuntu-10.04/mongodb.list.erb b/mongodb-debs/templates/ubuntu-10.04/mongodb.list.erb similarity index 100% rename from mongodb/templates/ubuntu-10.04/mongodb.list.erb rename to mongodb-debs/templates/ubuntu-10.04/mongodb.list.erb diff --git a/mongodb/templates/ubuntu-9.04/mongodb.list.erb b/mongodb-debs/templates/ubuntu-9.04/mongodb.list.erb similarity index 100% rename from mongodb/templates/ubuntu-9.04/mongodb.list.erb rename to mongodb-debs/templates/ubuntu-9.04/mongodb.list.erb diff --git a/mongodb/templates/ubuntu-9.10/mongodb.list.erb b/mongodb-debs/templates/ubuntu-9.10/mongodb.list.erb similarity index 100% rename from mongodb/templates/ubuntu-9.10/mongodb.list.erb rename to mongodb-debs/templates/ubuntu-9.10/mongodb.list.erb diff --git a/mongodb/README.rdoc b/mongodb/README.rdoc deleted file mode 100644 index 8d77480..0000000 --- a/mongodb/README.rdoc +++ /dev/null @@ -1,8 +0,0 @@ -= DESCRIPTION: - -= REQUIREMENTS: - -= ATTRIBUTES: - -= USAGE: - diff --git a/mongodb/metadata.json b/mongodb/metadata.json deleted file mode 100644 index 7308881..0000000 --- a/mongodb/metadata.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "recipes": { - }, - "replacing": { - }, - "attributes": { - }, - "maintainer_email": "marius@promethost.com", - "groupings": { - }, - "dependencies": { - }, - "recommendations": { - }, - "long_description": "= DESCRIPTION:\n\n= REQUIREMENTS:\n\n= ATTRIBUTES: \n\n= USAGE:\n\n", - "suggestions": { - }, - "platforms": { - "debian": [ - - ], - "ubuntu": [ - - ] - }, - "license": "Apache 2.0", - "version": "0.1.0", - "conflicting": { - }, - "name": "mongodb", - "providing": { - }, - "description": "Installs MongoDB", - "maintainer": "Promet Solutions" - } \ No newline at end of file