sotm: Add required apache_module expires

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

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 93702571b5ba38a90a9e3fa9f945641afc6d841f..29e665a43dc0934fc0b1bcbb23d75f7436489cff 100644 (file)
--- a/cookbooks/dev/metadata.rb
+++ b/cookbooks/dev/metadata.rb
@@ -1,41 +1,23 @@
 name              "dev"
 maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 name              "dev"
 maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"

-license           "Apache 2.0"
+license           "Apache-2.0"

 description       "Installs and configures dev services"
 description       "Installs and configures dev services"

-long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))
+

 version           "1.0.0"
 version           "1.0.0"

+supports          "ubuntu"

 depends           "apache"
 depends           "passenger"
 depends           "apache"
 depends           "passenger"

+depends           "chef"
+depends           "geoipupdate"

 depends           "git"
 depends           "git"

+depends           "memcached"
+depends           "munin"

 depends           "mysql"
 depends           "nodejs"
 depends           "mysql"
 depends           "nodejs"

+depends           "php"

 depends           "postgresql"
 depends           "python"
 depends           "postgresql"
 depends           "python"

+depends           "ruby"

 depends           "tools"
 depends           "web"
 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