Merge remote-tracking branch 'github/pull/396'

[chef.git] / cookbooks / dev / metadata.rb

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 8b5c166b72c57dec866e7f31233985281f22ee21..457e46dd090e4936639a5f67e5b48c6e3ad3c2ea 100644 (file)
--- a/cookbooks/dev/metadata.rb
+++ b/cookbooks/dev/metadata.rb
@@ -1,40 +1,22 @@
 name              "dev"
 maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
-license           "Apache 2.0"
+license           "Apache-2.0"
 description       "Installs and configures dev services"
-long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))
+
 version           "1.0.0"
+supports          "ubuntu"
 depends           "apache"
 depends           "passenger"
+depends           "chef"
+depends           "geoipupdate"
 depends           "git"
+depends           "memcached"
+depends           "munin"
 depends           "mysql"
 depends           "nodejs"
+depends           "php"
 depends           "postgresql"
+depends           "python"
 depends           "tools"
 depends           "web"
-
-attribute "rails",
-  :display_name => "Rails Configuration",
-  :description => "Hash of rails port configuration information",
-  :type => "hash"
-
-attribute "rails/sites",
-  :display_name => "Rails Installations",
-  :description => "Hash of rails port installations to configure",
-  :type => "hash"
-
-attribute "rails/sites/repository",
-  :display_name => "Repository",
-  :description => "Git repository to use",
-  :default => "git://git.openstreetmap.org/rails.git"
-
-attribute "rails/sites/revision",
-  :display_name => "Revision",
-  :description => "Revision to use",
-  :default => "live"
-
-attribute "rails/sites/database",
-  :display_name => "Database",
-  :description => "Database to use",
-  :default => nil