Remove ssl_enabled option for mediawiki sites

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

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 2f273b7ceeb7b0c0ee7f706343a1b188eba1d0be..56eff35ae4bb1faa327e4a66b72a2cd7e703022b 100644 (file)
--- a/cookbooks/dev/metadata.rb
+++ b/cookbooks/dev/metadata.rb
@@ -1,37 +1,17 @@
+name              "dev"

 maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 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.rdoc'))
+long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))

 version           "1.0.0"
 version           "1.0.0"

+supports          "ubuntu"

 depends           "apache"
 depends           "apache"

+depends           "passenger"

 depends           "git"
 depends           "mysql"
 depends           "git"
 depends           "mysql"

+depends           "nodejs"

 depends           "postgresql"
 depends           "postgresql"

+depends           "python"

 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