From 416b7a73da47eb284fad640bfaa1159cab1b6c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Hu=CC=88sch?= Date: Mon, 25 Nov 2013 15:59:00 +0100 Subject: [PATCH] Streamline metadata. --- agent_version/metadata.rb | 6 ++ apache2/metadata.rb | 85 ++++++++++---------- dependencies/metadata.rb | 10 ++- deploy/metadata.rb | 23 +++--- ebs/metadata.rb | 7 +- gem_support/metadata.rb | 8 +- haproxy/metadata.rb | 19 +++-- memcached/metadata.rb | 7 +- mod_php5_apache2/metadata.rb | 11 ++- mysql/metadata.rb | 16 ++-- nginx/metadata.rb | 14 ++-- opsworks_agent_monit/metadata.rb | 8 +- opsworks_bundler/metadata.rb | 5 ++ opsworks_cleanup/metadata.rb | 6 +- opsworks_commons/metadata.rb | 7 +- opsworks_custom_cookbooks/metadata.rb | 7 +- opsworks_ganglia/metadata.rb | 16 ++-- opsworks_initial_setup/metadata.rb | 6 +- opsworks_java/metadata.rb | 11 +-- opsworks_nodejs/metadata.rb | 8 ++ opsworks_rubygems/metadata.rb | 7 ++ opsworks_shutdown/metadata.rb | 5 ++ opsworks_stack_state_sync/metadata.rb | 5 ++ packages/metadata.rb | 10 +-- passenger_apache2/metadata.rb | 18 ++--- php/metadata.rb | 5 ++ rails/metadata.rb | 11 +-- ruby/metadata.rb | 8 ++ ruby_enterprise/metadata.rb | 12 +-- runit/metadata.json | 108 -------------------------- runit/metadata.rb | 14 ++-- scm_helper/metadata.rb | 8 +- ssh_host_keys/metadata.rb | 5 ++ ssh_users/metadata.rb | 6 +- test_suite/metadata.rb | 6 ++ unicorn/metadata.rb | 15 ++-- 36 files changed, 245 insertions(+), 278 deletions(-) create mode 100644 opsworks_nodejs/metadata.rb create mode 100644 opsworks_shutdown/metadata.rb create mode 100644 php/metadata.rb delete mode 100644 runit/metadata.json diff --git a/agent_version/metadata.rb b/agent_version/metadata.rb index 28fbe0f92b..c78efe2f15 100644 --- a/agent_version/metadata.rb +++ b/agent_version/metadata.rb @@ -1 +1,7 @@ +name "agent_version" +description "Prepares the OpsWorks agent version to be installed" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + depends 'opsworks_initial_setup' diff --git a/apache2/metadata.rb b/apache2/metadata.rb index bb86b948b3..6255e0a891 100644 --- a/apache2/metadata.rb +++ b/apache2/metadata.rb @@ -1,47 +1,44 @@ -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions" -long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.9" -recipe "apache2", "Main Apache configuration" -recipe "apache2::service", "Install and control Apache system service" -recipe "apache2::mod_alias", "Apache module 'alias' with config file" -recipe "apache2::mod_auth_basic", "Apache module 'auth_basic'" -recipe "apache2::mod_auth_digest", "Apache module 'auth_digest'" -recipe "apache2::mod_authn_file", "Apache module 'authn_file'" -recipe "apache2::mod_authnz_ldap", "Apache module 'authnz_ldap'" -recipe "apache2::mod_authz_default", "Apache module 'authz_default'" -recipe "apache2::mod_authz_groupfile", "Apache module 'authz_groupfile'" -recipe "apache2::mod_authz_host", "Apache module 'authz_host'" -recipe "apache2::mod_authz_user", "Apache module 'authz_user'" -recipe "apache2::mod_autoindex", "Apache module 'autoindex' with config file" -recipe "apache2::mod_cgi", "Apache module 'cgi'" -recipe "apache2::mod_dav", "Apache module 'dav'" -recipe "apache2::mod_dav_svn", "Apache module 'dav_svn'" -recipe "apache2::mod_deflate", "Apache module 'deflate' with config file" -recipe "apache2::mod_dir", "Apache module 'dir' with config file" -recipe "apache2::mod_env", "Apache module 'env'" -recipe "apache2::mod_expires", "Apache module 'expires'" -recipe "apache2::mod_fcgid", "Apache module 'fcgid', package on ubuntu/debian, rhel/centos, compile source on suse; with config file" -recipe "apache2::mod_headers", "Apache module 'headers'" -recipe "apache2::mod_ldap", "Apache module 'ldap'" -recipe "apache2::mod_log_config", "Apache module 'log_config'" -recipe "apache2::mod_mime", "Apache module 'mime' with config file" -recipe "apache2::mod_negotiation", "Apache module 'negotiation' with config file" -recipe "apache2::mod_php5", "Apache module 'php5'" -recipe "apache2::mod_proxy", "Apache module 'proxy' with config file" -recipe "apache2::mod_proxy_http", "Apache module 'proxy_http'" -recipe "apache2::mod_python", "Apache module 'python'" -recipe "apache2::mod_rewrite", "Apache module 'rewrite'" -recipe "apache2::mod_setenvif", "Apache module 'setenvif' with config file" -recipe "apache2::mod_ssl", "Apache module 'ssl' with config file, adds port 443 to listen_ports" -recipe "apache2::mod_status", "Apache module 'status' with config file" -recipe "apache2::logrotate", "Apache Logrotate configuration" - -['centos','redhat','fedora','amazon','debian','ubuntu'].each do |os| - supports os -end +name "apache2" +description "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions" +long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + +recipe "apache2", "Main Apache configuration" +recipe "apache2::service", "Install and control Apache system service" +recipe "apache2::mod_alias", "Apache module 'alias' with config file" +recipe "apache2::mod_auth_basic", "Apache module 'auth_basic'" +recipe "apache2::mod_auth_digest", "Apache module 'auth_digest'" +recipe "apache2::mod_authn_file", "Apache module 'authn_file'" +recipe "apache2::mod_authnz_ldap", "Apache module 'authnz_ldap'" +recipe "apache2::mod_authz_default", "Apache module 'authz_default'" +recipe "apache2::mod_authz_groupfile", "Apache module 'authz_groupfile'" +recipe "apache2::mod_authz_host", "Apache module 'authz_host'" +recipe "apache2::mod_authz_user", "Apache module 'authz_user'" +recipe "apache2::mod_autoindex", "Apache module 'autoindex' with config file" +recipe "apache2::mod_cgi", "Apache module 'cgi'" +recipe "apache2::mod_dav", "Apache module 'dav'" +recipe "apache2::mod_dav_svn", "Apache module 'dav_svn'" +recipe "apache2::mod_deflate", "Apache module 'deflate' with config file" +recipe "apache2::mod_dir", "Apache module 'dir' with config file" +recipe "apache2::mod_env", "Apache module 'env'" +recipe "apache2::mod_expires", "Apache module 'expires'" +recipe "apache2::mod_fcgid", "Apache module 'fcgid', package on ubuntu/debian, rhel/centos, compile source on suse; with config file" +recipe "apache2::mod_headers", "Apache module 'headers'" +recipe "apache2::mod_ldap", "Apache module 'ldap'" +recipe "apache2::mod_log_config", "Apache module 'log_config'" +recipe "apache2::mod_mime", "Apache module 'mime' with config file" +recipe "apache2::mod_negotiation", "Apache module 'negotiation' with config file" +recipe "apache2::mod_php5", "Apache module 'php5'" +recipe "apache2::mod_proxy", "Apache module 'proxy' with config file" +recipe "apache2::mod_proxy_http", "Apache module 'proxy_http'" +recipe "apache2::mod_python", "Apache module 'python'" +recipe "apache2::mod_rewrite", "Apache module 'rewrite'" +recipe "apache2::mod_setenvif", "Apache module 'setenvif' with config file" +recipe "apache2::mod_ssl", "Apache module 'ssl' with config file, adds port 443 to listen_ports" +recipe "apache2::mod_status", "Apache module 'status' with config file" +recipe "apache2::logrotate", "Apache Logrotate configuration" attribute "apache", :display_name => "Apache Hash", diff --git a/dependencies/metadata.rb b/dependencies/metadata.rb index f0d273545d..c703e353a9 100644 --- a/dependencies/metadata.rb +++ b/dependencies/metadata.rb @@ -1,12 +1,16 @@ -maintainer "Amazon Web Services" +name "dependencies" description "Install .gem and .deb depencencies" -version "0.1" -recipe "dependencies::update", "Update all packages and gems" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends "ruby_enterprise" depends "ruby" depends "gem_support" depends "packages" +depends "opsworks_nodejs" + +recipe "dependencies::update", "Update all packages and gems" attribute "dependencies/gems", :display_name => "Gems to install", diff --git a/deploy/metadata.rb b/deploy/metadata.rb index 7379bc2873..28ea11882a 100644 --- a/deploy/metadata.rb +++ b/deploy/metadata.rb @@ -1,14 +1,8 @@ -maintainer "Amazon Web Services" +name "deploy" description "Deploy applications" -version "0.1" -recipe "deploy::scm", "Install and setup the source code management system" -recipe "deploy::rails", "Deploy a Rails application" -recipe "deploy::php", "Deploy a PHP application" -recipe "deploy::rails-undeploy", "Remove a Rails application" -recipe "deploy::mysql", "Create the MySQL database for an app" -recipe "deploy::mysql-configure", "Reconfigure the database" -recipe "deploy::logrotate", "Logrotate configuration for log files in shared/log/" -recipe "deploy::java", "Deploy a Java application" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends "dependencies" depends "apache2" @@ -19,3 +13,12 @@ depends "passenger_apache2" depends "unicorn" depends "opsworks_java" + +recipe "deploy::scm", "Install and setup the source code management system" +recipe "deploy::rails", "Deploy a Rails application" +recipe "deploy::php", "Deploy a PHP application" +recipe "deploy::rails-undeploy", "Remove a Rails application" +recipe "deploy::mysql", "Create the MySQL database for an app" +recipe "deploy::mysql-configure", "Reconfigure the database" +recipe "deploy::logrotate", "Logrotate configuration for log files in shared/log/" +recipe "deploy::java", "Deploy a Java application" diff --git a/ebs/metadata.rb b/ebs/metadata.rb index 764784b7fc..74b649f60a 100644 --- a/ebs/metadata.rb +++ b/ebs/metadata.rb @@ -1,5 +1,8 @@ -maintainer "Amazon Web Services" +name "ebs" description "Mounts attached EBS volumes" -version "0.1" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + recipe "ebs::volumes", "Mounts attached EBS volumes" recipe "ebs::raids", "Mounts attached EBS RAIDs" diff --git a/gem_support/metadata.rb b/gem_support/metadata.rb index db23ec176f..198c1d2811 100644 --- a/gem_support/metadata.rb +++ b/gem_support/metadata.rb @@ -1,3 +1,5 @@ -maintainer "Amazon Web Services" -description "Offers a few library functions to simplify dealing with RubyGems" -version "0.1" +name "gem_support" +description "Offers a few library functions to simplify dealing with RubyGems" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" diff --git a/haproxy/metadata.rb b/haproxy/metadata.rb index 1c94b15712..e09745cdab 100644 --- a/haproxy/metadata.rb +++ b/haproxy/metadata.rb @@ -1,16 +1,15 @@ -maintainer 'Opscode, Inc.' -maintainer_email 'cookbooks@opscode.com' -license 'Apache 2.0' -description 'Installs and configures haproxy' -long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version '0.7' +name "haproxy" +description 'Installs and configures haproxy' +long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + +depends 'opsworks_commons' + recipe 'haproxy', 'Install and configure a HAProxy instance' recipe 'haproxy::configure', 'reconfigure and restart HAProxy' -['debian','ubuntu'].each do |os| - supports os -end - attribute 'haproxy/backend', :display_name => 'Backend', :description => 'List of backend services to load balance', diff --git a/memcached/metadata.rb b/memcached/metadata.rb index b46c89cdb7..8b4eca41a4 100644 --- a/memcached/metadata.rb +++ b/memcached/metadata.rb @@ -1,7 +1,8 @@ -maintainer "Amazon Web Services" +name "memcached" description "Installs Memcached" -version "0.1" -supports "ubuntu" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends "opsworks_agent_monit" diff --git a/mod_php5_apache2/metadata.rb b/mod_php5_apache2/metadata.rb index 527b021270..fad9149832 100644 --- a/mod_php5_apache2/metadata.rb +++ b/mod_php5_apache2/metadata.rb @@ -1,8 +1,7 @@ -maintainer "Amazon Web Services" -license "Apache 2.0" -description "Installs/Configures Apache with mod_php5" -version "0.1" - -supports "ubuntu" +name "mod_php5_apache2" +description "Installs/Configures Apache with mod_php5" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends "apache2" diff --git a/mysql/metadata.rb b/mysql/metadata.rb index e29748e402..3ba1f62437 100644 --- a/mysql/metadata.rb +++ b/mysql/metadata.rb @@ -1,10 +1,8 @@ -maintainer "Amazon Web Services" -license "Apache 2.0" -description "Installs and configures MySQL" -version "0.1" -recipe "mysql::client", "Installs MySQL" -recipe "mysql::server", "Installs MySQL" +name "mysql" +description "Installs and configures MySQL" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" -['centos','redhat','fedora','amazon','debian','ubuntu'].each do |os| - supports os -end +recipe "mysql::client", "Installs MySQL" +recipe "mysql::server", "Installs MySQL" diff --git a/nginx/metadata.rb b/nginx/metadata.rb index 4e66a89598..3a2f2e8274 100644 --- a/nginx/metadata.rb +++ b/nginx/metadata.rb @@ -1,12 +1,8 @@ -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Installs and configures nginx" -version "0.8" - -%w{ ubuntu debian }.each do |os| - supports os -end +name "nginx" +description "Installs and configures nginx" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" attribute "nginx/dir", :display_name => "Nginx Directory", diff --git a/opsworks_agent_monit/metadata.rb b/opsworks_agent_monit/metadata.rb index b964950df3..980df98537 100644 --- a/opsworks_agent_monit/metadata.rb +++ b/opsworks_agent_monit/metadata.rb @@ -1,3 +1,7 @@ -maintainer "Amazon Web Services" +name "opsworks_agent_monit" description "Configures monit for the OpsWorks-Agent" -version "0.1" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + +depends 'opsworks_initial_setup' diff --git a/opsworks_bundler/metadata.rb b/opsworks_bundler/metadata.rb index e69de29bb2..a416292c75 100644 --- a/opsworks_bundler/metadata.rb +++ b/opsworks_bundler/metadata.rb @@ -0,0 +1,5 @@ +name "opsworks_bundler" +description "Installs Bundler" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" diff --git a/opsworks_cleanup/metadata.rb b/opsworks_cleanup/metadata.rb index f139aaacd3..ea997aefb4 100644 --- a/opsworks_cleanup/metadata.rb +++ b/opsworks_cleanup/metadata.rb @@ -1,5 +1,7 @@ -maintainer "Amazon Web Services" +name "opsworks_cleanup" description "Cleans up Chef run" -version "0.1" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends 'opsworks_initial_setup' diff --git a/opsworks_commons/metadata.rb b/opsworks_commons/metadata.rb index c9551efcee..2926cf3f0f 100644 --- a/opsworks_commons/metadata.rb +++ b/opsworks_commons/metadata.rb @@ -1,6 +1,7 @@ -name "opsworks_commons" -maintainer "Amazon Web Services" +name "opsworks_commons" description "Common recipes and libraries" -version "0.1" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends "dependencies" diff --git a/opsworks_custom_cookbooks/metadata.rb b/opsworks_custom_cookbooks/metadata.rb index 71f7283352..ef74efcf6f 100644 --- a/opsworks_custom_cookbooks/metadata.rb +++ b/opsworks_custom_cookbooks/metadata.rb @@ -1,6 +1,8 @@ -maintainer "Amazon Web Services" +name "opsworks_custom_cookbooks" description "Supports custom user cookbooks" -version "0.1" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" recipe "opsworks_custom_cookbooks::checkout", "Checkout custom Cookbooks" recipe "opsworks_custom_cookbooks::load", "Load custom Cookbooks" @@ -8,6 +10,7 @@ recipe "opsworks_custom_cookbooks::update", "Update custom Cookbooks" depends "scm_helper" +depends "opsworks_initial_setup" attribute "opsworks_custom_cookbooks/repository", :display_name => "URL to you Chef cookbooks", diff --git a/opsworks_ganglia/metadata.rb b/opsworks_ganglia/metadata.rb index b46c1b409f..42ae565df5 100644 --- a/opsworks_ganglia/metadata.rb +++ b/opsworks_ganglia/metadata.rb @@ -1,17 +1,19 @@ -maintainer "Amazon Web Services" -version "0.2" -supports "ubuntu" +name "opsworks_ganglia" +description "Installs Ganglia" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + +depends 'apache2' +depends 'opsworks_commons' +depends 'opsworks_initial_setup' recipe "opsworks_ganglia::server", "Ganglia server" recipe "opsworks_ganglia::configure-server", "Reconfigure Ganglia server with correct clients" recipe "opsworks_ganglia::client", "Ganglia client" recipe "opsworks_ganglia::configure-client", "Reconfigure Ganglia client with correct server" - recipe "opsworks_ganglia::monitor-memcached", "Monitor Memcached" recipe "opsworks_ganglia::monitor-mysql", "Monitor MySQL" recipe "opsworks_ganglia::monitor-fd-and-sockets", "Monitor File Descriptors and Sockets" recipe "opsworks_ganglia::monitor-disk", "Monitor Disk Stats" recipe "opsworks_ganglia::monitor-apache", "Monitor Apache Stats" - -depends 'apache2' -depends 'opsworks_commons' diff --git a/opsworks_initial_setup/metadata.rb b/opsworks_initial_setup/metadata.rb index 81796c48a8..6e344952fc 100644 --- a/opsworks_initial_setup/metadata.rb +++ b/opsworks_initial_setup/metadata.rb @@ -1,6 +1,8 @@ -maintainer "Amazon Web Services" +name "opsworks_initial_setup" description "Initial Setup for EC2 instances" -version "0.1" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends "opsworks_commons" diff --git a/opsworks_java/metadata.rb b/opsworks_java/metadata.rb index ca86a2ea60..2c9bf2ee3d 100644 --- a/opsworks_java/metadata.rb +++ b/opsworks_java/metadata.rb @@ -1,6 +1,7 @@ -maintainer 'Amazon Web Services' -license 'Apache 2.0' -description 'Installs and configures a Java application server' -version '0.1' +name "opsworks_java" +description 'Installs and configures a Java application server' +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" -depends 'apache2' +depends 'apache2' diff --git a/opsworks_nodejs/metadata.rb b/opsworks_nodejs/metadata.rb new file mode 100644 index 0000000000..dea4dd93d0 --- /dev/null +++ b/opsworks_nodejs/metadata.rb @@ -0,0 +1,8 @@ +name "opsworks_nodejs" +description 'Installs and configures a Node.js application server' +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + +depends 'deploy' +depends 'opsworks_commons' diff --git a/opsworks_rubygems/metadata.rb b/opsworks_rubygems/metadata.rb index e69de29bb2..61fbe77cf7 100644 --- a/opsworks_rubygems/metadata.rb +++ b/opsworks_rubygems/metadata.rb @@ -0,0 +1,7 @@ +name "opsworks_rubygems" +description "Installs Rubygems" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + +depends 'opsworks_initial_setup' diff --git a/opsworks_shutdown/metadata.rb b/opsworks_shutdown/metadata.rb new file mode 100644 index 0000000000..888611176a --- /dev/null +++ b/opsworks_shutdown/metadata.rb @@ -0,0 +1,5 @@ +name "opsworks_shutdown" +description "Cleans up before an instance as actually shut down on EC2" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" diff --git a/opsworks_stack_state_sync/metadata.rb b/opsworks_stack_state_sync/metadata.rb index e69de29bb2..5df1bd63a1 100644 --- a/opsworks_stack_state_sync/metadata.rb +++ b/opsworks_stack_state_sync/metadata.rb @@ -0,0 +1,5 @@ +name "opsworks_stack_state_sync" +description "Populates /etc/hosts and /etc/motd" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" diff --git a/packages/metadata.rb b/packages/metadata.rb index 2aa40437b7..e4412a88c7 100644 --- a/packages/metadata.rb +++ b/packages/metadata.rb @@ -1,8 +1,8 @@ -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Helper library to determine whether distribution-only packages are installed" -version "0.7" +name "packages" +description "Helper library to determine whether distribution-only packages are installed" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" attribute "packages", :display_name => "Packages", diff --git a/passenger_apache2/metadata.rb b/passenger_apache2/metadata.rb index 356b9deb42..bc601be5d3 100644 --- a/passenger_apache2/metadata.rb +++ b/passenger_apache2/metadata.rb @@ -1,18 +1,14 @@ -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Installs passenger for Apache2" -long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) -version "0.11" +name "passenger_apache2" +description "Installs passenger for Apache2" +long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc')) +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" -%w{ packages gem_support apache2 nginx unicorn rails }.each do |cb| +%w{ packages gem_support apache2 nginx unicorn rails opsworks_initial_setup }.each do |cb| depends cb end -%w{ redhat centos amazon ubuntu debian }.each do |os| - supports os -end - attribute "passenger/version", :display_name => "Passenger Version", :description => "Version of Passenger to install", diff --git a/php/metadata.rb b/php/metadata.rb new file mode 100644 index 0000000000..a30ba50862 --- /dev/null +++ b/php/metadata.rb @@ -0,0 +1,5 @@ +name "php" +description "Installs PHP" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" diff --git a/rails/metadata.rb b/rails/metadata.rb index 575786b80f..893055c51e 100644 --- a/rails/metadata.rb +++ b/rails/metadata.rb @@ -1,14 +1,15 @@ -maintainer "Amazon Web Services" +name "rails" description "Installs Rails" -version "0.1" -supports "ubuntu", ">= 8.10" - -recipe "rails::configure", "Re-configure a Rails application" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends "apache2" depends "deploy" depends "nginx" +recipe "rails::configure", "Re-configure a Rails application" + attribute "rails", :display_name => "Rails", :description => "Hash of Rails attributes", diff --git a/ruby/metadata.rb b/ruby/metadata.rb index 648a1ed5e6..069e387303 100644 --- a/ruby/metadata.rb +++ b/ruby/metadata.rb @@ -1,2 +1,10 @@ +name "ruby" +description "Installs Ruby" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + depends 'opsworks_bundler' depends 'opsworks_rubygems' +depends 'opsworks_initial_setup' +depends 'opsworks_commons' diff --git a/ruby_enterprise/metadata.rb b/ruby_enterprise/metadata.rb index ed0647d2f7..cca705576b 100644 --- a/ruby_enterprise/metadata.rb +++ b/ruby_enterprise/metadata.rb @@ -1,9 +1,9 @@ -maintainer "Amazon Web Services" -license "Apache 2.0" -description "Installs/Configures ruby-enterprise" -version "0.1" - -supports "ubuntu" +name "ruby_enterprise" +description "Installs/Configures ruby-enterprise" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends 'opsworks_rubygems' depends 'opsworks_bundler' +depends 'opsworks_commons' diff --git a/runit/metadata.json b/runit/metadata.json deleted file mode 100644 index f25fbb2ef9..0000000000 --- a/runit/metadata.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "name": "runit", - "description": "Installs runit and provides runit_service definition", - "long_description": "", - "maintainer": "Opscode, Inc.", - "maintainer_email": "cookbooks@opscode.com", - "license": "Apache 2.0", - "platforms": { - "ubuntu": [ - - ], - "debian": [ - - ], - "gentoo": [ - - ] - }, - "dependencies": { - }, - "recommendations": { - }, - "suggestions": { - }, - "conflicting": { - }, - "providing": { - }, - "replacing": { - }, - "attributes": { - "runit": { - "display_name": "Runit", - "description": "Hash of runit attributes", - "type": "hash", - "choice": [ - - ], - "calculated": false, - "required": "optional", - "recipes": [ - - ] - }, - "runit/sv_bin": { - "display_name": "Runit sv bin", - "description": "Location of the sv binary", - "default": "/usr/bin/sv", - "choice": [ - - ], - "calculated": false, - "type": "string", - "required": "optional", - "recipes": [ - - ] - }, - "runit/chpst_bin": { - "display_name": "Runit chpst bin", - "description": "Location of the chpst binary", - "default": "/usr/bin/chpst", - "choice": [ - - ], - "calculated": false, - "type": "string", - "required": "optional", - "recipes": [ - - ] - }, - "runit/service_dir": { - "display_name": "Runit service directory", - "description": "Symlinks to services managed under runit", - "default": "/etc/service", - "choice": [ - - ], - "calculated": false, - "type": "string", - "required": "optional", - "recipes": [ - - ] - }, - "runit/sv_dir": { - "display_name": "Runit sv directory", - "description": "Location of services managed by runit", - "default": "/etc/sv", - "choice": [ - - ], - "calculated": false, - "type": "string", - "required": "optional", - "recipes": [ - - ] - } - }, - "groupings": { - }, - "recipes": { - "runit": "Installs and configures runit" - }, - "version": "0.14.2" -} diff --git a/runit/metadata.rb b/runit/metadata.rb index c748b9351b..711b84eb27 100644 --- a/runit/metadata.rb +++ b/runit/metadata.rb @@ -1,15 +1,11 @@ -maintainer "Opscode, Inc." -maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" -description "Installs runit and provides runit_service definition" -version "0.14.2" +name "runit" +description "Installs runit and provides runit_service definition" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" recipe "runit", "Installs and configures runit" -%w{ ubuntu debian gentoo }.each do |os| - supports os -end - attribute "runit", :display_name => "Runit", :description => "Hash of runit attributes", diff --git a/scm_helper/metadata.rb b/scm_helper/metadata.rb index a9e4c8ae1a..16dcddd2f2 100644 --- a/scm_helper/metadata.rb +++ b/scm_helper/metadata.rb @@ -1,5 +1,7 @@ -maintainer "Amazon Web Services" -description "Offers a few library functions to interact with source control systems" -version "0.1" +name "scm_helper" +description "Offers a few library functions to interact with source control systems" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends "opsworks_commons" diff --git a/ssh_host_keys/metadata.rb b/ssh_host_keys/metadata.rb index e69de29bb2..e495a97b1b 100644 --- a/ssh_host_keys/metadata.rb +++ b/ssh_host_keys/metadata.rb @@ -0,0 +1,5 @@ +name "ssh_host_keys" +description "Installs SSH host keys" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" diff --git a/ssh_users/metadata.rb b/ssh_users/metadata.rb index ea52f13722..dc34238f62 100644 --- a/ssh_users/metadata.rb +++ b/ssh_users/metadata.rb @@ -1,5 +1,7 @@ -maintainer 'Amazon Web Services' +name "ssh_users" description 'Create system users for OpsWorks users with personal SSH keys' -version '0.1' +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" depends 'opsworks_initial_setup' diff --git a/test_suite/metadata.rb b/test_suite/metadata.rb index 43e47bf802..23f50ca8ee 100644 --- a/test_suite/metadata.rb +++ b/test_suite/metadata.rb @@ -1 +1,7 @@ +name "test_suite" +description "runs cookbook tests" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" + depends 'opsworks_commons' diff --git a/unicorn/metadata.rb b/unicorn/metadata.rb index 3925bef581..c0e8a8203b 100644 --- a/unicorn/metadata.rb +++ b/unicorn/metadata.rb @@ -1,8 +1,9 @@ -maintainer "AWS OpsWorks" -license "Apache 2.0" -description "Manage unicorn" -version "0.1" +name "unicorn" +description "Manage unicorn" +maintainer "AWS OpsWorks" +license "Apache 2.0" +version "1.0.0" -['centos','redhat','fedora','amazon','debian','ubuntu'].each do |os| - supports os -end +depends 'apache2' +depends 'nginx' +depends 'rails'