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

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

diff --git a/cookbooks/git/metadata.rb b/cookbooks/git/metadata.rb
index fa82a439c5db02c11da7d821c72f824ad7fc1f40..b86267bd2112d62a16c4a34db405c3cfc7aa4726 100644 (file)
--- a/cookbooks/git/metadata.rb
+++ b/cookbooks/git/metadata.rb
@@ -1,23 +1,12 @@
 name              "git"
 maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"
 name              "git"
 maintainer        "OpenStreetMap Administrators"
 maintainer_email  "admins@openstreetmap.org"

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

 description       "Installs and configures git"
 description       "Installs and configures git"

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

 version           "1.0.0"
 version           "1.0.0"

-depends           "networking"
-depends           "xinetd"
+supports          "ubuntu"
+depends           "accounts"

 depends           "apache"
 depends           "apache"

-
-attribute "git",
-  :display_name => "Git",
-  :description => "Hash of Git attributes",
-  :type => "hash"
-
-attribute "git/host",
-  :display_name => "Server Hostname",
-  :description => "Hostname to use for Git server"
-
-attribute "git/directory",
-  :display_name => "Repository Directory",
-  :description => "Directory to use for Git server repositories"
+depends           "apt"
+depends           "networking"