Switch culebre, fafnir, ladon and trogdor to squid 4

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

diff --git a/cookbooks/osqa/metadata.rb b/cookbooks/osqa/metadata.rb
index eb9898710a673c0da812154896ce90801c59b632..02f870410394bf7b57c1b901dc8f4e8b6086ef24 100644 (file)
--- a/cookbooks/osqa/metadata.rb
+++ b/cookbooks/osqa/metadata.rb
@@ -1,50 +1,12 @@
 name              "osqa"
 maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 name              "osqa"
 maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"

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

 description       "Installs and configures OSQA"
 description       "Installs and configures OSQA"

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

 version           "1.0.0"
 version           "1.0.0"

+supports          "ubuntu"

 depends           "apache"
 depends           "memcached"
 depends           "apache"
 depends           "memcached"

+depends           "python"

 depends           "tools"
 depends           "tools"

-
-attribute "osqa",
-  :display_name => "OSQA",
-  :description => "Hash of OSQA attributes",
-  :type => "hash"
-
-attribute "osqa/revision",
-  :display_name => "OSQA Revision",
-  :description => "Default revision of OSQA to use",
-  :default => "703"
-
-attribute "osqa/user",
-  :display_name => "User",
-  :description => "Default user to run OSQA as",
-  :default => "osqa"
-
-attribute "osqa/group",
-  :display_name => "Group",
-  :description => "Default group to run OSQA ad",
-  :default => nil
-
-attribute "osqa/database_name",
-  :display_name => "Database Name",
-  :description => "Default database to run OSQA against",
-  :default => "osqa"
-
-attribute "osqa/database_user",
-  :display_name => "Database User",
-  :description => "Default user for OSQA to connect to the database as",
-  :default => "osqa"
-
-attribute "osqa/database_password",
-  :display_name => "Database Password",
-  :description => "Default password for OSQA to authenticate to the database with",
-  :default => ""
-
-attribute "osqa/sites",
-  :display_name => "Sites",
-  :description => "Array of OSQA sites to setup",
-  :default => []