From: Tom Hughes Date: Tue, 11 Jul 2017 20:10:32 +0000 (+0100) Subject: Fix new foodcritic warnings X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/18424e9038b5f06d815167da8f0c10bed5d5d211 Fix new foodcritic warnings --- diff --git a/cookbooks/accounts/.foodcritic b/cookbooks/accounts/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/accounts/.foodcritic +++ b/cookbooks/accounts/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/accounts/metadata.rb b/cookbooks/accounts/metadata.rb index f85cff465..6d458937e 100644 --- a/cookbooks/accounts/metadata.rb +++ b/cookbooks/accounts/metadata.rb @@ -1,27 +1,8 @@ name "accounts" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Accounts management" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" - -attribute "accounts", - :display_name => "Accounts", - :description => "Hash of account attributes", - :type => "hash" - -attribute "accounts/home", - :display_name => "Home Directory", - :description => "Home directory for accounts", - :default => "/home" - -attribute "accounts/shell", - :display_name => "Default Shell", - :description => "Default shell for accounts", - :default => "/bin/bash" - -attribute "accounts/users", - :display_name => "Users", - :description => "User account details", - :type => "hash" +supports "ubuntu" diff --git a/cookbooks/apache/.foodcritic b/cookbooks/apache/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/apache/.foodcritic +++ b/cookbooks/apache/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/apache/metadata.rb b/cookbooks/apache/metadata.rb index 635f9cfca..b944ae524 100644 --- a/cookbooks/apache/metadata.rb +++ b/cookbooks/apache/metadata.rb @@ -1,9 +1,10 @@ name "apache" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures apache" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "munin" depends "ssl" diff --git a/cookbooks/apt/.foodcritic b/cookbooks/apt/.foodcritic index a085263c8..6f7140762 100644 --- a/cookbooks/apt/.foodcritic +++ b/cookbooks/apt/.foodcritic @@ -1,3 +1,6 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 +~FC074 diff --git a/cookbooks/apt/metadata.rb b/cookbooks/apt/metadata.rb index d9661aae2..7c86a9615 100644 --- a/cookbooks/apt/metadata.rb +++ b/cookbooks/apt/metadata.rb @@ -1,7 +1,7 @@ name "apt" maintainer "Tom Hughes" maintainer_email "tom@compton.nu" -license "Apache 2.0" +license "Apache-2.0" description "Installs/Configures apt" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "0.1" diff --git a/cookbooks/backup/.foodcritic b/cookbooks/backup/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/backup/.foodcritic +++ b/cookbooks/backup/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/backup/metadata.rb b/cookbooks/backup/metadata.rb index ed57e3616..b11c4f043 100644 --- a/cookbooks/backup/metadata.rb +++ b/cookbooks/backup/metadata.rb @@ -1,7 +1,8 @@ name "backup" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures backup.openstreetmap.org" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/bind/.foodcritic b/cookbooks/bind/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/bind/.foodcritic +++ b/cookbooks/bind/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/bind/metadata.rb b/cookbooks/bind/metadata.rb index 3488028c2..dd8792bbe 100644 --- a/cookbooks/bind/metadata.rb +++ b/cookbooks/bind/metadata.rb @@ -1,18 +1,9 @@ name "bind" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures bind" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "networking" - -attribute "bind", - :display_name => "bind", - :description => "Hash of bind attributes", - :type => "hash" - -attribute "bind/forwarders", - :display_name => "bind", - :description => "Array of resolvers to forward to", - :type => "array" diff --git a/cookbooks/blog/.foodcritic b/cookbooks/blog/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/blog/.foodcritic +++ b/cookbooks/blog/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/blog/metadata.rb b/cookbooks/blog/metadata.rb index 0ac7d0903..d2999707e 100644 --- a/cookbooks/blog/metadata.rb +++ b/cookbooks/blog/metadata.rb @@ -1,8 +1,9 @@ name "blog" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures Blog services" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "wordpress" diff --git a/cookbooks/blogs/.foodcritic b/cookbooks/blogs/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/blogs/.foodcritic +++ b/cookbooks/blogs/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/blogs/metadata.rb b/cookbooks/blogs/metadata.rb index 2461ead90..53d183969 100644 --- a/cookbooks/blogs/metadata.rb +++ b/cookbooks/blogs/metadata.rb @@ -1,9 +1,10 @@ name "blogs" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures server-info web site" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "git" diff --git a/cookbooks/cgiirc/.foodcritic b/cookbooks/cgiirc/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/cgiirc/.foodcritic +++ b/cookbooks/cgiirc/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/cgiirc/metadata.rb b/cookbooks/cgiirc/metadata.rb index 444522c49..2e65ef58f 100644 --- a/cookbooks/cgiirc/metadata.rb +++ b/cookbooks/cgiirc/metadata.rb @@ -1,8 +1,9 @@ name "cgiirc" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures cgiirc" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" diff --git a/cookbooks/chef/.foodcritic b/cookbooks/chef/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/chef/.foodcritic +++ b/cookbooks/chef/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/chef/metadata.rb b/cookbooks/chef/metadata.rb index e43f04715..57172dafe 100644 --- a/cookbooks/chef/metadata.rb +++ b/cookbooks/chef/metadata.rb @@ -1,10 +1,11 @@ name "chef" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures chef" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "apt" depends "git" diff --git a/cookbooks/civicrm/.foodcritic b/cookbooks/civicrm/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/civicrm/.foodcritic +++ b/cookbooks/civicrm/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/civicrm/metadata.rb b/cookbooks/civicrm/metadata.rb index 9b47426d0..bf73c7650 100644 --- a/cookbooks/civicrm/metadata.rb +++ b/cookbooks/civicrm/metadata.rb @@ -1,9 +1,10 @@ name "civicrm" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures CiviCRM" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "wordpress" depends "mysql" diff --git a/cookbooks/clamav/.foodcritic b/cookbooks/clamav/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/clamav/.foodcritic +++ b/cookbooks/clamav/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/clamav/metadata.rb b/cookbooks/clamav/metadata.rb index c144002b0..cd16f87dd 100644 --- a/cookbooks/clamav/metadata.rb +++ b/cookbooks/clamav/metadata.rb @@ -1,7 +1,8 @@ name "clamav" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures clamav" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/db/.foodcritic b/cookbooks/db/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/db/.foodcritic +++ b/cookbooks/db/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/db/metadata.rb b/cookbooks/db/metadata.rb index a93bc9034..2a7f0c694 100644 --- a/cookbooks/db/metadata.rb +++ b/cookbooks/db/metadata.rb @@ -1,10 +1,11 @@ name "db" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures database servers" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "postgresql" depends "web" depends "git" diff --git a/cookbooks/dev/.foodcritic b/cookbooks/dev/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/dev/.foodcritic +++ b/cookbooks/dev/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb index 93702571b..56eff35ae 100644 --- a/cookbooks/dev/metadata.rb +++ b/cookbooks/dev/metadata.rb @@ -1,10 +1,11 @@ name "dev" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures dev services" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "passenger" depends "git" @@ -14,28 +15,3 @@ depends "postgresql" depends "python" 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 diff --git a/cookbooks/devices/.foodcritic b/cookbooks/devices/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/devices/.foodcritic +++ b/cookbooks/devices/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/devices/metadata.rb b/cookbooks/devices/metadata.rb index 87e069b20..a217b49e8 100644 --- a/cookbooks/devices/metadata.rb +++ b/cookbooks/devices/metadata.rb @@ -1,12 +1,8 @@ name "devices" maintainer "Tom Hughes" maintainer_email "tom@compton.nu" -license "Apache 2.0" +license "Apache-2.0" description "Configures devices" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "0.1" - -attribute "devices", - :display_name => "Kernel Parameters", - :description => "Hash of devices", - :type => "hash" +supports "ubuntu" diff --git a/cookbooks/dhcpd/.foodcritic b/cookbooks/dhcpd/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/dhcpd/.foodcritic +++ b/cookbooks/dhcpd/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/dhcpd/metadata.rb b/cookbooks/dhcpd/metadata.rb index 7f661d662..c61b6d664 100644 --- a/cookbooks/dhcpd/metadata.rb +++ b/cookbooks/dhcpd/metadata.rb @@ -1,13 +1,9 @@ name "dhcpd" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures dhcpd" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "networking" - -attribute "dhcpd", - :display_name => "dhcpd", - :description => "Hash of dhcpd attributes", - :type => "hash" diff --git a/cookbooks/dns/.foodcritic b/cookbooks/dns/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/dns/.foodcritic +++ b/cookbooks/dns/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/dns/metadata.rb b/cookbooks/dns/metadata.rb index 6a0eef09a..94c6099c0 100644 --- a/cookbooks/dns/metadata.rb +++ b/cookbooks/dns/metadata.rb @@ -1,9 +1,10 @@ name "dns" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configure DNS management" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "git" depends "apache" diff --git a/cookbooks/donate/.foodcritic b/cookbooks/donate/.foodcritic index 05e4c9141..15ed978ff 100644 --- a/cookbooks/donate/.foodcritic +++ b/cookbooks/donate/.foodcritic @@ -2,3 +2,5 @@ ~FC034 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/donate/metadata.rb b/cookbooks/donate/metadata.rb index 078fec273..04855143e 100644 --- a/cookbooks/donate/metadata.rb +++ b/cookbooks/donate/metadata.rb @@ -1,10 +1,11 @@ name "donate" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures Donate Site" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "mysql" depends "git" diff --git a/cookbooks/elasticsearch/.foodcritic b/cookbooks/elasticsearch/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/elasticsearch/.foodcritic +++ b/cookbooks/elasticsearch/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/elasticsearch/metadata.rb b/cookbooks/elasticsearch/metadata.rb index bf14fba3a..1d956c02a 100644 --- a/cookbooks/elasticsearch/metadata.rb +++ b/cookbooks/elasticsearch/metadata.rb @@ -1,7 +1,8 @@ name "elasticsearch" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures a elasticsearch server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/exim/.foodcritic b/cookbooks/exim/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/exim/.foodcritic +++ b/cookbooks/exim/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/exim/metadata.rb b/cookbooks/exim/metadata.rb index ed1d59da5..eb25776e1 100644 --- a/cookbooks/exim/metadata.rb +++ b/cookbooks/exim/metadata.rb @@ -1,58 +1,9 @@ name "exim" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures exim" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "networking" - -attribute "exim", - :display_name => "Exim", - :description => "Hash of exim attributes", - :type => "hash" - -attribute "exim/local_domains", - :display_name => "Domains to Handle Locally", - :description => "List of domains we are prepared to accept mail for", - :default => ["@"] - -attribute "exim/relay_to_domains", - :display_name => "Domains to Relay To", - :description => "List of domains we are prepared to relay to", - :default => [] - -attribute "exim/relay_from_hosts", - :display_name => "Hosts to Relay From", - :description => "List of hosts we are prepared to relay from", - :default => ["127.0.0.1", "::1"] - -attribute "exim/daemon_smtp_ports", - :display_name => "Ports to Listen On", - :description => "List of ports we will listen on", - :default => [25] - -attribute "exim/trusted_users", - :display_name => "Trusted Users", - :description => "List of users we will trust", - :default => [] - -attribute "exim/smarthost_name", - :display_name => "Smarthost Name", - :description => "Name of this smarthost", - :default => nil - -attribute "exim/smarthost_via", - :display_name => "Smarthost Via", - :description => "Smarthost to use for sending mail", - :default => "mail.openstreetmap.org:26" - -attribute "exim/routes", - :display_name => "Custom Routes", - :description => "Custom routes for handling local mail", - :default => {} - -attribute "exim/aliases", - :display_name => "Mail Aliases", - :description => "Mail aliases", - :default => {} diff --git a/cookbooks/fail2ban/.foodcritic b/cookbooks/fail2ban/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/fail2ban/.foodcritic +++ b/cookbooks/fail2ban/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/fail2ban/metadata.rb b/cookbooks/fail2ban/metadata.rb index 8f62b08cd..472d3518f 100644 --- a/cookbooks/fail2ban/metadata.rb +++ b/cookbooks/fail2ban/metadata.rb @@ -1,7 +1,8 @@ name "fail2ban" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures fail2ban" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/forum/.foodcritic b/cookbooks/forum/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/forum/.foodcritic +++ b/cookbooks/forum/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/forum/metadata.rb b/cookbooks/forum/metadata.rb index ea3407d02..a7a0ffcdb 100644 --- a/cookbooks/forum/metadata.rb +++ b/cookbooks/forum/metadata.rb @@ -1,10 +1,11 @@ name "forum" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures a roundup server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "git" depends "mysql" diff --git a/cookbooks/foundation/.foodcritic b/cookbooks/foundation/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/foundation/.foodcritic +++ b/cookbooks/foundation/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/foundation/metadata.rb b/cookbooks/foundation/metadata.rb index 3a2bec765..2b2b7c735 100644 --- a/cookbooks/foundation/metadata.rb +++ b/cookbooks/foundation/metadata.rb @@ -1,10 +1,11 @@ name "foundation" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures foundation services" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "git" depends "mediawiki" diff --git a/cookbooks/geodns/.foodcritic b/cookbooks/geodns/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/geodns/.foodcritic +++ b/cookbooks/geodns/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/geodns/metadata.rb b/cookbooks/geodns/metadata.rb index 9dd9a0a37..bbc676a39 100644 --- a/cookbooks/geodns/metadata.rb +++ b/cookbooks/geodns/metadata.rb @@ -1,7 +1,8 @@ name "geodns" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures a geographic DNS server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/git/.foodcritic b/cookbooks/git/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/git/.foodcritic +++ b/cookbooks/git/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/git/metadata.rb b/cookbooks/git/metadata.rb index fa82a439c..704f32750 100644 --- a/cookbooks/git/metadata.rb +++ b/cookbooks/git/metadata.rb @@ -1,23 +1,11 @@ name "git" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures git" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "networking" depends "xinetd" 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" diff --git a/cookbooks/gps-tile/.foodcritic b/cookbooks/gps-tile/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/gps-tile/.foodcritic +++ b/cookbooks/gps-tile/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/gps-tile/metadata.rb b/cookbooks/gps-tile/metadata.rb index 53a5fb75f..43c89179d 100644 --- a/cookbooks/gps-tile/metadata.rb +++ b/cookbooks/gps-tile/metadata.rb @@ -1,9 +1,10 @@ name "gps-tile" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures a GPS tile server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "systemd" diff --git a/cookbooks/hardware/.foodcritic b/cookbooks/hardware/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/hardware/.foodcritic +++ b/cookbooks/hardware/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/hardware/metadata.rb b/cookbooks/hardware/metadata.rb index ae6806f50..a702ae0c6 100644 --- a/cookbooks/hardware/metadata.rb +++ b/cookbooks/hardware/metadata.rb @@ -1,10 +1,11 @@ name "hardware" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures hardware" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apt" depends "git" depends "munin" diff --git a/cookbooks/imagery/.foodcritic b/cookbooks/imagery/.foodcritic index 5c5875e10..e14faa44f 100644 --- a/cookbooks/imagery/.foodcritic +++ b/cookbooks/imagery/.foodcritic @@ -2,3 +2,5 @@ ~FC005 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/imagery/metadata.rb b/cookbooks/imagery/metadata.rb index 74a4a1d89..10074efc4 100644 --- a/cookbooks/imagery/metadata.rb +++ b/cookbooks/imagery/metadata.rb @@ -1,10 +1,11 @@ name "imagery" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures imagery" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "nginx" depends "git" depends "systemd" diff --git a/cookbooks/incron/.foodcritic b/cookbooks/incron/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/incron/.foodcritic +++ b/cookbooks/incron/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/incron/metadata.rb b/cookbooks/incron/metadata.rb index 42d6738a6..12e8e0cd7 100644 --- a/cookbooks/incron/metadata.rb +++ b/cookbooks/incron/metadata.rb @@ -1,7 +1,8 @@ name "incron" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures incron" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/kibana/.foodcritic b/cookbooks/kibana/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/kibana/.foodcritic +++ b/cookbooks/kibana/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/kibana/metadata.rb b/cookbooks/kibana/metadata.rb index 4e1c8833b..a8509ca26 100644 --- a/cookbooks/kibana/metadata.rb +++ b/cookbooks/kibana/metadata.rb @@ -1,9 +1,10 @@ name "kibana" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures a kibana server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "systemd" diff --git a/cookbooks/letsencrypt/.foodcritic b/cookbooks/letsencrypt/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/letsencrypt/.foodcritic +++ b/cookbooks/letsencrypt/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/letsencrypt/metadata.rb b/cookbooks/letsencrypt/metadata.rb index 69f1d32db..32412e1ce 100644 --- a/cookbooks/letsencrypt/metadata.rb +++ b/cookbooks/letsencrypt/metadata.rb @@ -1,8 +1,9 @@ name "letsencrypt" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Support for letsencrypt certificates" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" diff --git a/cookbooks/logstash/.foodcritic b/cookbooks/logstash/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/logstash/.foodcritic +++ b/cookbooks/logstash/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/logstash/metadata.rb b/cookbooks/logstash/metadata.rb index 5e4405a21..8fd573da0 100644 --- a/cookbooks/logstash/metadata.rb +++ b/cookbooks/logstash/metadata.rb @@ -1,8 +1,9 @@ name "logstash" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures a elasticsearch server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "networking" diff --git a/cookbooks/mailman/.foodcritic b/cookbooks/mailman/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/mailman/.foodcritic +++ b/cookbooks/mailman/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/mailman/metadata.rb b/cookbooks/mailman/metadata.rb index 0ba3d6a21..b6bb6f613 100644 --- a/cookbooks/mailman/metadata.rb +++ b/cookbooks/mailman/metadata.rb @@ -1,8 +1,9 @@ name "mailman" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures mailman" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" diff --git a/cookbooks/mediawiki/.foodcritic b/cookbooks/mediawiki/.foodcritic index 26719e832..af9a69afb 100644 --- a/cookbooks/mediawiki/.foodcritic +++ b/cookbooks/mediawiki/.foodcritic @@ -2,3 +2,5 @@ ~FC021 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/mediawiki/metadata.rb b/cookbooks/mediawiki/metadata.rb index 46daf9a65..f0440f0ed 100644 --- a/cookbooks/mediawiki/metadata.rb +++ b/cookbooks/mediawiki/metadata.rb @@ -1,10 +1,11 @@ name "mediawiki" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures mediawiki" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "memcached" depends "apache" depends "mysql" diff --git a/cookbooks/memcached/.foodcritic b/cookbooks/memcached/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/memcached/.foodcritic +++ b/cookbooks/memcached/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/memcached/metadata.rb b/cookbooks/memcached/metadata.rb index 7abd699a4..6bdf0775f 100644 --- a/cookbooks/memcached/metadata.rb +++ b/cookbooks/memcached/metadata.rb @@ -1,7 +1,8 @@ name "memcached" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures memcached" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/munin/.foodcritic b/cookbooks/munin/.foodcritic index 6f1cca483..8f83d01e2 100644 --- a/cookbooks/munin/.foodcritic +++ b/cookbooks/munin/.foodcritic @@ -3,3 +3,5 @@ ~FC005 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/munin/metadata.rb b/cookbooks/munin/metadata.rb index b45c7575c..314a0b2b3 100644 --- a/cookbooks/munin/metadata.rb +++ b/cookbooks/munin/metadata.rb @@ -1,9 +1,10 @@ name "munin" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures munin" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "networking" diff --git a/cookbooks/mysql/.foodcritic b/cookbooks/mysql/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/mysql/.foodcritic +++ b/cookbooks/mysql/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/mysql/metadata.rb b/cookbooks/mysql/metadata.rb index 18b2492d7..0641d5bf3 100644 --- a/cookbooks/mysql/metadata.rb +++ b/cookbooks/mysql/metadata.rb @@ -1,13 +1,9 @@ name "mysql" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures mysql" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "munin" - -attribute "mysql", - :display_name => "MySQL", - :description => "Hash of MySQL configuration details", - :type => "hash" diff --git a/cookbooks/networking/.foodcritic b/cookbooks/networking/.foodcritic index 8addb0b76..c8f7322db 100644 --- a/cookbooks/networking/.foodcritic +++ b/cookbooks/networking/.foodcritic @@ -3,3 +3,5 @@ ~FC015 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/networking/metadata.rb b/cookbooks/networking/metadata.rb index bbe92adce..04002fc8e 100644 --- a/cookbooks/networking/metadata.rb +++ b/cookbooks/networking/metadata.rb @@ -1,25 +1,9 @@ name "networking" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures networking" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" recipe "networking", "Configures networking via attributes" supports "ubuntu" - -attribute "networking", - :display_name => "Networking", - :description => "Hash of networking attributes", - :type => "hash" - -attribute "networking/search", - :display_name => "Resolver Search Path", - :description => "List of domains to search", - :default => "domain" - -attribute "networking/nameservers", - :display_name => "Nameservers", - :description => "List of nameservers to use", - :type => "array", - :default => [""] diff --git a/cookbooks/nfs/.foodcritic b/cookbooks/nfs/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/nfs/.foodcritic +++ b/cookbooks/nfs/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/nfs/metadata.rb b/cookbooks/nfs/metadata.rb index b2038e832..fa8e7e47b 100644 --- a/cookbooks/nfs/metadata.rb +++ b/cookbooks/nfs/metadata.rb @@ -1,7 +1,8 @@ name "nfs" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures nfs" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/nginx/.foodcritic b/cookbooks/nginx/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/nginx/.foodcritic +++ b/cookbooks/nginx/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/nginx/metadata.rb b/cookbooks/nginx/metadata.rb index 2710e6c54..7c1171f61 100644 --- a/cookbooks/nginx/metadata.rb +++ b/cookbooks/nginx/metadata.rb @@ -1,8 +1,9 @@ name "nginx" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures nginx" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "ssl" diff --git a/cookbooks/nodejs/.foodcritic b/cookbooks/nodejs/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/nodejs/.foodcritic +++ b/cookbooks/nodejs/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/nodejs/metadata.rb b/cookbooks/nodejs/metadata.rb index 702c77c3b..57c121f3c 100644 --- a/cookbooks/nodejs/metadata.rb +++ b/cookbooks/nodejs/metadata.rb @@ -1,7 +1,8 @@ name "nodejs" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures Node.js" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/nodejs/providers/package.rb b/cookbooks/nodejs/providers/package.rb index 9d83f40ff..0ecd08eba 100644 --- a/cookbooks/nodejs/providers/package.rb +++ b/cookbooks/nodejs/providers/package.rb @@ -43,25 +43,29 @@ action :install do end if !@packages.include?(new_resource.package_name) - shell_out!("npm install --global #{package_name}") - new_resource.updated_by_last_action(true) + converge_by "install #{package_name}" do + shell_out!("npm install --global #{package_name}") + end elsif new_resource.version && new_resource.version != @current_resource.version - shell_out!("npm install --global #{package_name}") - new_resource.updated_by_last_action(true) + converge_by "update #{package_name}" do + shell_out!("npm install --global #{package_name}") + end end end action :upgrade do if @packages.include?(new_resource.package_name) - shell_out!("npm update --global #{new_resource.package_name}") - new_resource.updated_by_last_action(true) + converge_by "update #{new_resource.package_name}" do + shell_out!("npm update --global #{new_resource.package_name}") + end end end action :remove do if @packages.include?(new_resource.package_name) - shell_out!("npm remove --global #{new_resource.package_name}") - new_resource.updated_by_last_action(true) + converge_by "remove #{new_resource.package_name}" do + shell_out!("npm remove --global #{new_resource.package_name}") + end end end diff --git a/cookbooks/nodejs/resources/package.rb b/cookbooks/nodejs/resources/package.rb index 243411216..db9424024 100644 --- a/cookbooks/nodejs/resources/package.rb +++ b/cookbooks/nodejs/resources/package.rb @@ -17,12 +17,9 @@ # limitations under the License. # +default_action :iinstall + actions :install, :upgrade, :remove attribute :package_name, :kind_of => String, :name_attribute => true attribute :version, :kind_of => String - -def initialize(*args) - super - @action = :install -end diff --git a/cookbooks/nominatim/.foodcritic b/cookbooks/nominatim/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/nominatim/.foodcritic +++ b/cookbooks/nominatim/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/nominatim/metadata.rb b/cookbooks/nominatim/metadata.rb index 24dd31986..20f5012c9 100644 --- a/cookbooks/nominatim/metadata.rb +++ b/cookbooks/nominatim/metadata.rb @@ -1,10 +1,11 @@ name "nominatim" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures nominatim servers" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "postgresql" depends "git" diff --git a/cookbooks/ntp/.foodcritic b/cookbooks/ntp/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/ntp/.foodcritic +++ b/cookbooks/ntp/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/ntp/metadata.rb b/cookbooks/ntp/metadata.rb index 484d0d23d..a1d8dda22 100644 --- a/cookbooks/ntp/metadata.rb +++ b/cookbooks/ntp/metadata.rb @@ -1,34 +1,8 @@ name "ntp" maintainer "Opscode, Inc." maintainer_email "cookbooks@opscode.com" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures ntp as a client or server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "0.8.2" - -recipe "ntp", "Installs and configures ntp either as a server or client" - -%w[ubuntu debian redhat centos fedora].each do |os| - supports os -end - -attribute "ntp", - :display_name => "NTP", - :description => "Hash of NTP attributes", - :type => "hash" - -attribute "ntp/service", - :display_name => "NTP Service", - :description => "Name of the NTP service", - :default => "ntp" - -attribute "ntp/is_server", - :display_name => "NTP Is Server?", - :description => "Set to true if this is an NTP server", - :default => "false" - -attribute "ntp/servers", - :display_name => "NTP Servers", - :description => "Array of servers we should talk to", - :type => "array", - :default => ["0.us.pool.ntp.org", "1.us.pool.ntp.org"] +supports "ubuntu" diff --git a/cookbooks/ohai/.foodcritic b/cookbooks/ohai/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/ohai/.foodcritic +++ b/cookbooks/ohai/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/ohai/metadata.rb b/cookbooks/ohai/metadata.rb index 426a1ad5c..0aab6c223 100644 --- a/cookbooks/ohai/metadata.rb +++ b/cookbooks/ohai/metadata.rb @@ -1,7 +1,8 @@ name "ohai" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures ohai" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/openssh/.foodcritic b/cookbooks/openssh/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/openssh/.foodcritic +++ b/cookbooks/openssh/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/openssh/metadata.rb b/cookbooks/openssh/metadata.rb index aec91a628..37cda7e7c 100644 --- a/cookbooks/openssh/metadata.rb +++ b/cookbooks/openssh/metadata.rb @@ -1,7 +1,7 @@ name "openssh" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures openssh" version "1.0.0" recipe "openssh", "Installs and configures openssh" diff --git a/cookbooks/openvpn/.foodcritic b/cookbooks/openvpn/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/openvpn/.foodcritic +++ b/cookbooks/openvpn/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/openvpn/metadata.rb b/cookbooks/openvpn/metadata.rb index 7478cdec4..974d2e703 100644 --- a/cookbooks/openvpn/metadata.rb +++ b/cookbooks/openvpn/metadata.rb @@ -1,7 +1,8 @@ name "openvpn" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures OpenVPN" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/osmosis/.foodcritic b/cookbooks/osmosis/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/osmosis/.foodcritic +++ b/cookbooks/osmosis/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/osmosis/metadata.rb b/cookbooks/osmosis/metadata.rb index b5c22ec53..d61a694f2 100644 --- a/cookbooks/osmosis/metadata.rb +++ b/cookbooks/osmosis/metadata.rb @@ -1,8 +1,9 @@ name "osmosis" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures osmosis" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "chef" diff --git a/cookbooks/osqa/.foodcritic b/cookbooks/osqa/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/osqa/.foodcritic +++ b/cookbooks/osqa/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/osqa/metadata.rb b/cookbooks/osqa/metadata.rb index 75ca0ba39..a5cda8d47 100644 --- a/cookbooks/osqa/metadata.rb +++ b/cookbooks/osqa/metadata.rb @@ -1,51 +1,12 @@ name "osqa" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures OSQA" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "memcached" depends "python" 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 => [] diff --git a/cookbooks/otrs/.foodcritic b/cookbooks/otrs/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/otrs/.foodcritic +++ b/cookbooks/otrs/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/otrs/metadata.rb b/cookbooks/otrs/metadata.rb index bb738af76..c85c7a990 100644 --- a/cookbooks/otrs/metadata.rb +++ b/cookbooks/otrs/metadata.rb @@ -1,55 +1,11 @@ name "otrs" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures OTRS" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "postgresql" depends "tools" - -attribute "otrs", - :display_name => "OTRS", - :description => "Hash of OTRS attributes", - :type => "hash" - -attribute "otrs/version", - :display_name => "OTRS Version", - :description => "Version of OTRS to use", - :default => "3.1.5" - -attribute "otrs/user", - :display_name => "User", - :description => "Iser to run OTRS as", - :default => "otrs" - -attribute "otrs/group", - :display_name => "Group", - :description => "Group to run OTRS as", - :default => nil - -attribute "otrs/database_cluster", - :display_name => "Database Cluster", - :description => "Database cluster to run OTRS against", - :default => "8.4/main" - -attribute "otrs/database_name", - :display_name => "Database Name", - :description => "Database to run OTRS against", - :default => "otrs" - -attribute "otrs/database_user", - :display_name => "Database User", - :description => "User for OTRS to connect to the database as", - :default => "otrs" - -attribute "otrs/database_password", - :display_name => "Database Password", - :description => "Password for OTRS to authenticate to the database with", - :default => "" - -attribute "otrs/site", - :display_name => "Site", - :description => "Name of OTRS site", - :default => nil diff --git a/cookbooks/owl/.foodcritic b/cookbooks/owl/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/owl/.foodcritic +++ b/cookbooks/owl/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/owl/metadata.rb b/cookbooks/owl/metadata.rb index 86976a6f9..7eeade7c9 100644 --- a/cookbooks/owl/metadata.rb +++ b/cookbooks/owl/metadata.rb @@ -1,9 +1,10 @@ name "owl" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures OWL servers" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "postgresql" diff --git a/cookbooks/passenger/.foodcritic b/cookbooks/passenger/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/passenger/.foodcritic +++ b/cookbooks/passenger/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/passenger/metadata.rb b/cookbooks/passenger/metadata.rb index 937c95fe9..b1d06b595 100644 --- a/cookbooks/passenger/metadata.rb +++ b/cookbooks/passenger/metadata.rb @@ -1,9 +1,10 @@ name "passenger" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures passenger" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "munin" diff --git a/cookbooks/piwik/.foodcritic b/cookbooks/piwik/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/piwik/.foodcritic +++ b/cookbooks/piwik/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/piwik/metadata.rb b/cookbooks/piwik/metadata.rb index fd4f28965..0745806c3 100644 --- a/cookbooks/piwik/metadata.rb +++ b/cookbooks/piwik/metadata.rb @@ -1,9 +1,10 @@ name "piwik" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures Piwik" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "mysql" diff --git a/cookbooks/planet/.foodcritic b/cookbooks/planet/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/planet/.foodcritic +++ b/cookbooks/planet/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/planet/metadata.rb b/cookbooks/planet/metadata.rb index d26c7ff8c..2bd8fd1c7 100644 --- a/cookbooks/planet/metadata.rb +++ b/cookbooks/planet/metadata.rb @@ -1,10 +1,11 @@ name "planet" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures a planet server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "git" depends "osmosis" diff --git a/cookbooks/postgresql/.foodcritic b/cookbooks/postgresql/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/postgresql/.foodcritic +++ b/cookbooks/postgresql/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/postgresql/metadata.rb b/cookbooks/postgresql/metadata.rb index 07dbc4d45..be4903e90 100644 --- a/cookbooks/postgresql/metadata.rb +++ b/cookbooks/postgresql/metadata.rb @@ -1,19 +1,9 @@ name "postgresql" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures postgresql" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "ohai" - -attribute "postgresql", - :display_name => "PostgreSQL", - :description => "Hash of PostgreSQL configuration details", - :type => "hash" - -attribute "postgresql/versions", - :display_name => "Versions", - :description => "List of versions to install", - :type => "array", - :default => [] diff --git a/cookbooks/postgresql/providers/database.rb b/cookbooks/postgresql/providers/database.rb index 998d2bed3..1a8402b4b 100644 --- a/cookbooks/postgresql/providers/database.rb +++ b/cookbooks/postgresql/providers/database.rb @@ -36,17 +36,20 @@ end action :create do if !@pg.databases.include?(new_resource.database) - @pg.execute(:command => "CREATE DATABASE \"#{new_resource.database}\" OWNER \"#{new_resource.owner}\" TEMPLATE template0 ENCODING '#{new_resource.encoding}' LC_COLLATE '#{new_resource.collation}' LC_CTYPE '#{new_resource.ctype}'") - new_resource.updated_by_last_action(true) + converge_by "create database #{new_resource.database}" do + @pg.execute(:command => "CREATE DATABASE \"#{new_resource.database}\" OWNER \"#{new_resource.owner}\" TEMPLATE template0 ENCODING '#{new_resource.encoding}' LC_COLLATE '#{new_resource.collation}' LC_CTYPE '#{new_resource.ctype}'") + end elsif new_resource.owner != @current_resource.owner - @pg.execute(:command => "ALTER DATABASE \"#{new_resource.database}\" OWNER TO \"#{new_resource.owner}\"") - new_resource.updated_by_last_action(true) + converge_by "alter database #{new_resource.database}" do + @pg.execute(:command => "ALTER DATABASE \"#{new_resource.database}\" OWNER TO \"#{new_resource.owner}\"") + end end end action :drop do if @pg.databases.include?(new_resource.database) - @pg.execute(:command => "DROP DATABASE \"#{new_resource.database}\"") - new_resource.updated_by_last_action(true) + converge_by "drop database #{new_resource.database}" do + @pg.execute(:command => "DROP DATABASE \"#{new_resource.database}\"") + end end end diff --git a/cookbooks/postgresql/providers/execute.rb b/cookbooks/postgresql/providers/execute.rb index e15a493a0..c50cb27d5 100644 --- a/cookbooks/postgresql/providers/execute.rb +++ b/cookbooks/postgresql/providers/execute.rb @@ -34,11 +34,11 @@ end action :run do options = { :database => new_resource.database, :user => new_resource.user, :group => new_resource.group } - if ::File.exist?(new_resource.command) - @pg.execute(options.merge(:file => new_resource.command)) - else - @pg.execute(options.merge(:command => new_resource.command)) + converge_by "execute #{new_resource.command}" do + if ::File.exist?(new_resource.command) + @pg.execute(options.merge(:file => new_resource.command)) + else + @pg.execute(options.merge(:command => new_resource.command)) + end end - - new_resource.updated_by_last_action(true) end diff --git a/cookbooks/postgresql/providers/extension.rb b/cookbooks/postgresql/providers/extension.rb index 848b7630e..875806990 100644 --- a/cookbooks/postgresql/providers/extension.rb +++ b/cookbooks/postgresql/providers/extension.rb @@ -31,14 +31,16 @@ end action :create do unless @pg.extensions(new_resource.database).include?(new_resource.extension) - @pg.execute(:command => "CREATE EXTENSION #{new_resource.extension}", :database => new_resource.database) - new_resource.updated_by_last_action(true) + converge_by "create extension #{new_resource.extension}" do + @pg.execute(:command => "CREATE EXTENSION #{new_resource.extension}", :database => new_resource.database) + end end end action :drop do if @pg.extensions(new_resource.database).include?(new_resource.extension) - @pg.execute(:command => "DROP EXTENSION #{new_resource.extension}", :database => new_resource.database) - new_resource.updated_by_last_action(true) + converge_by "drop extension #{new_resource.extension}" do + @pg.execute(:command => "DROP EXTENSION #{new_resource.extension}", :database => new_resource.database) + end end end diff --git a/cookbooks/postgresql/providers/tablespace.rb b/cookbooks/postgresql/providers/tablespace.rb index a2d4af925..22ff39600 100644 --- a/cookbooks/postgresql/providers/tablespace.rb +++ b/cookbooks/postgresql/providers/tablespace.rb @@ -30,14 +30,16 @@ end action :create do unless @pg.tablespaces.include?(new_resource.tablespace) - @pg.execute(:command => "CREATE TABLESPACE #{new_resource.tablespace} LOCATION '#{new_resource.location}'") - new_resource.updated_by_last_action(true) + converge_by "create tablespace #{new_resource.tablespace}" do + @pg.execute(:command => "CREATE TABLESPACE #{new_resource.tablespace} LOCATION '#{new_resource.location}'") + end end end action :drop do if @pg.tablespaces.include?(new_resource.tablespace) - @pg.execute(:command => "DROP TABLESPACE #{new_resource.tablespace}") - new_resource.updated_by_last_action(true) + converge_by "drop tablespace #{new_resource.tablespace}" do + @pg.execute(:command => "DROP TABLESPACE #{new_resource.tablespace}") + end end end diff --git a/cookbooks/postgresql/providers/user.rb b/cookbooks/postgresql/providers/user.rb index 5df0f3847..22d01a4dc 100644 --- a/cookbooks/postgresql/providers/user.rb +++ b/cookbooks/postgresql/providers/user.rb @@ -44,28 +44,33 @@ action :create do replication = new_resource.replication ? "REPLICATION" : "NOREPLICATION" if !@pg.users.include?(new_resource.user) - @pg.execute(:command => "CREATE ROLE \"#{new_resource.user}\" LOGIN #{password} #{superuser} #{createdb} #{createrole}") - new_resource.updated_by_last_action(true) + converge_by "create role #{new_resource.user}" do + @pg.execute(:command => "CREATE ROLE \"#{new_resource.user}\" LOGIN #{password} #{superuser} #{createdb} #{createrole}") + end else if new_resource.superuser != @current_resource.superuser - @pg.execute(:command => "ALTER ROLE \"#{new_resource.user}\" #{superuser}") - new_resource.updated_by_last_action(true) + converge_by "alter role #{new_resource.user}" do + @pg.execute(:command => "ALTER ROLE \"#{new_resource.user}\" #{superuser}") + end end unless new_resource.superuser if new_resource.createdb != @current_resource.createdb - @pg.execute(:command => "ALTER ROLE \"#{new_resource.user}\" #{createdb}") - new_resource.updated_by_last_action(true) + converge_by "alter role #{new_resource.user}" do + @pg.execute(:command => "ALTER ROLE \"#{new_resource.user}\" #{createdb}") + end end if new_resource.createrole != @current_resource.createrole - @pg.execute(:command => "ALTER ROLE \"#{new_resource.user}\" #{createrole}") - new_resource.updated_by_last_action(true) + converge_by "alter role #{new_resource.user}" do + @pg.execute(:command => "ALTER ROLE \"#{new_resource.user}\" #{createrole}") + end end if new_resource.replication != @current_resource.replication - @pg.execute(:command => "ALTER ROLE \"#{new_resource.user}\" #{replication}") - new_resource.updated_by_last_action(true) + converge_by "alter role #{new_resource.user}" do + @pg.execute(:command => "ALTER ROLE \"#{new_resource.user}\" #{replication}") + end end end end @@ -73,7 +78,8 @@ end action :drop do if @pg.users.include?(new_resource.user) - @pg.execute(:command => "DROP ROLE \"#{new_resource.user}\"") - new_resource.updated_by_last_action(true) + converge_by "drop role #{new_resource.user}" do + @pg.execute(:command => "DROP ROLE \"#{new_resource.user}\"") + end end end diff --git a/cookbooks/postgresql/resources/database.rb b/cookbooks/postgresql/resources/database.rb index 1a63f3ac8..1e8f3972c 100644 --- a/cookbooks/postgresql/resources/database.rb +++ b/cookbooks/postgresql/resources/database.rb @@ -17,6 +17,8 @@ # limitations under the License. # +default_action :create + actions :create, :drop attribute :database, :kind_of => String, :name_attribute => true @@ -25,8 +27,3 @@ attribute :owner, :kind_of => String, :required => true attribute :encoding, :kind_of => String, :default => "UTF8" attribute :collation, :kind_of => String, :default => "en_GB.UTF8" attribute :ctype, :kind_of => String, :default => "en_GB.UTF8" - -def initialize(*args) - super - @action = :create -end diff --git a/cookbooks/postgresql/resources/execute.rb b/cookbooks/postgresql/resources/execute.rb index 49ff80e4f..f01e21912 100644 --- a/cookbooks/postgresql/resources/execute.rb +++ b/cookbooks/postgresql/resources/execute.rb @@ -17,6 +17,8 @@ # limitations under the License. # +default_action :run + actions :nothing, :run attribute :command, :kind_of => String, :name_attribute => true @@ -24,8 +26,3 @@ attribute :cluster, :kind_of => String, :required => true attribute :database, :kind_of => String, :required => true attribute :user, :default => "postgres" attribute :group, :default => "postgres" - -def initialize(*args) - super - @action = :run -end diff --git a/cookbooks/postgresql/resources/extension.rb b/cookbooks/postgresql/resources/extension.rb index 8c876f473..a1363424d 100644 --- a/cookbooks/postgresql/resources/extension.rb +++ b/cookbooks/postgresql/resources/extension.rb @@ -17,13 +17,10 @@ # limitations under the License. # +default_action :create + actions :create, :drop attribute :extension, :kind_of => String, :name_attribute => true attribute :cluster, :kind_of => String, :required => true attribute :database, :kind_of => String, :required => true - -def initialize(*args) - super - @action = :create -end diff --git a/cookbooks/postgresql/resources/tablespace.rb b/cookbooks/postgresql/resources/tablespace.rb index 167a68bfd..93bb021ce 100644 --- a/cookbooks/postgresql/resources/tablespace.rb +++ b/cookbooks/postgresql/resources/tablespace.rb @@ -17,13 +17,10 @@ # limitations under the License. # +default_action :create + actions :create, :drop attribute :tablespace, :kind_of => String, :name_attribute => true attribute :cluster, :kind_of => String, :required => true attribute :location, :kind_of => String, :required => true - -def initialize(*args) - super - @action = :create -end diff --git a/cookbooks/postgresql/resources/user.rb b/cookbooks/postgresql/resources/user.rb index f5fefa35a..5cbb94d58 100644 --- a/cookbooks/postgresql/resources/user.rb +++ b/cookbooks/postgresql/resources/user.rb @@ -17,6 +17,8 @@ # limitations under the License. # +default_action :create + actions :create, :drop attribute :user, :kind_of => String, :name_attribute => true @@ -26,8 +28,3 @@ attribute :superuser, :default => false attribute :createdb, :default => false attribute :createrole, :default => false attribute :replication, :default => false - -def initialize(*args) - super - @action = :create -end diff --git a/cookbooks/python/.foodcritic b/cookbooks/python/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/python/.foodcritic +++ b/cookbooks/python/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/python/metadata.rb b/cookbooks/python/metadata.rb index 789050a15..4158ef8bd 100644 --- a/cookbooks/python/metadata.rb +++ b/cookbooks/python/metadata.rb @@ -1,7 +1,8 @@ name "python" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures Python" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/python/resources/package.rb b/cookbooks/python/resources/package.rb index 3a766957e..76a6af7ec 100644 --- a/cookbooks/python/resources/package.rb +++ b/cookbooks/python/resources/package.rb @@ -19,8 +19,8 @@ default_action :install -attribute :package_name, :kind_of => String, :name_attribute => true -attribute :version, :kind_of => String +property :package_name, :kind_of => String, :name_property => true +property :version, :kind_of => String action :install do if version.nil? diff --git a/cookbooks/roundup/.foodcritic b/cookbooks/roundup/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/roundup/.foodcritic +++ b/cookbooks/roundup/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/roundup/metadata.rb b/cookbooks/roundup/metadata.rb index 8b1be50f1..727bcfec0 100644 --- a/cookbooks/roundup/metadata.rb +++ b/cookbooks/roundup/metadata.rb @@ -1,8 +1,9 @@ name "roundup" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures a roundup server" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" diff --git a/cookbooks/rsyncd/.foodcritic b/cookbooks/rsyncd/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/rsyncd/.foodcritic +++ b/cookbooks/rsyncd/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/rsyncd/metadata.rb b/cookbooks/rsyncd/metadata.rb index 0aeda0cf1..1f3b344fa 100644 --- a/cookbooks/rsyncd/metadata.rb +++ b/cookbooks/rsyncd/metadata.rb @@ -1,18 +1,9 @@ name "rsyncd" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures rsyncd" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "networking" - -attribute "rsyncd", - :display_name => "rsyncd", - :description => "Hash of rsyncd attributes", - :type => "hash" - -attribute "rsyncd/modules", - :display_name => "rsyncd", - :description => "Hash of rsyncd modules to configure", - :type => "hash" diff --git a/cookbooks/serverinfo/.foodcritic b/cookbooks/serverinfo/.foodcritic index 4081e3704..b0f9b4b7d 100644 --- a/cookbooks/serverinfo/.foodcritic +++ b/cookbooks/serverinfo/.foodcritic @@ -1,3 +1,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/serverinfo/metadata.rb b/cookbooks/serverinfo/metadata.rb index af6c1cf42..65c55cf2c 100644 --- a/cookbooks/serverinfo/metadata.rb +++ b/cookbooks/serverinfo/metadata.rb @@ -1,9 +1,10 @@ name "serverinfo" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures server-info web site" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "git" diff --git a/cookbooks/snmpd/.foodcritic b/cookbooks/snmpd/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/snmpd/.foodcritic +++ b/cookbooks/snmpd/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/snmpd/metadata.rb b/cookbooks/snmpd/metadata.rb index 58dfbb217..95cde5e97 100644 --- a/cookbooks/snmpd/metadata.rb +++ b/cookbooks/snmpd/metadata.rb @@ -1,18 +1,9 @@ name "snmpd" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures snmpd" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "networking" - -attribute "snmpd", - :display_name => "snmpd", - :description => "Hash of snmpd attributes", - :type => "hash" - -attribute "snmpd/clients", - :display_name => "snmpd", - :description => "Array of addresses allowed to query snmpd", - :type => "array" diff --git a/cookbooks/spamassassin/.foodcritic b/cookbooks/spamassassin/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/spamassassin/.foodcritic +++ b/cookbooks/spamassassin/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/spamassassin/metadata.rb b/cookbooks/spamassassin/metadata.rb index 19f335ba8..fc72cc64a 100644 --- a/cookbooks/spamassassin/metadata.rb +++ b/cookbooks/spamassassin/metadata.rb @@ -1,7 +1,8 @@ name "spamassassin" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures spamassassin" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/squid/.foodcritic b/cookbooks/squid/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/squid/.foodcritic +++ b/cookbooks/squid/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/squid/metadata.rb b/cookbooks/squid/metadata.rb index 9e9397017..763b57d9c 100644 --- a/cookbooks/squid/metadata.rb +++ b/cookbooks/squid/metadata.rb @@ -1,8 +1,9 @@ name "squid" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures squid" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "systemd" diff --git a/cookbooks/ssl/.foodcritic b/cookbooks/ssl/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/ssl/.foodcritic +++ b/cookbooks/ssl/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/ssl/metadata.rb b/cookbooks/ssl/metadata.rb index 89f6df9d2..cad934150 100644 --- a/cookbooks/ssl/metadata.rb +++ b/cookbooks/ssl/metadata.rb @@ -1,7 +1,8 @@ name "ssl" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures basic SSL support" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/stateofthemap/.foodcritic b/cookbooks/stateofthemap/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/stateofthemap/.foodcritic +++ b/cookbooks/stateofthemap/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/stateofthemap/metadata.rb b/cookbooks/stateofthemap/metadata.rb index fcc8589a2..68bcf9e54 100644 --- a/cookbooks/stateofthemap/metadata.rb +++ b/cookbooks/stateofthemap/metadata.rb @@ -1,8 +1,9 @@ name "stateofthemap" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures State of the Map services" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "wordpress" diff --git a/cookbooks/stats/.foodcritic b/cookbooks/stats/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/stats/.foodcritic +++ b/cookbooks/stats/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/stats/metadata.rb b/cookbooks/stats/metadata.rb index 9ef4ba688..859d59b45 100644 --- a/cookbooks/stats/metadata.rb +++ b/cookbooks/stats/metadata.rb @@ -1,8 +1,9 @@ name "stats" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures stats.openstreetmap.org" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" diff --git a/cookbooks/subversion/.foodcritic b/cookbooks/subversion/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/subversion/.foodcritic +++ b/cookbooks/subversion/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/subversion/metadata.rb b/cookbooks/subversion/metadata.rb index 8886f6b93..64a49d989 100644 --- a/cookbooks/subversion/metadata.rb +++ b/cookbooks/subversion/metadata.rb @@ -1,8 +1,9 @@ name "subversion" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures subversion servers" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" diff --git a/cookbooks/supybot/.foodcritic b/cookbooks/supybot/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/supybot/.foodcritic +++ b/cookbooks/supybot/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/supybot/metadata.rb b/cookbooks/supybot/metadata.rb index 6c22755c5..0b65379d9 100644 --- a/cookbooks/supybot/metadata.rb +++ b/cookbooks/supybot/metadata.rb @@ -1,8 +1,9 @@ name "supybot" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures supybot" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "systemd" diff --git a/cookbooks/switch2osm/.foodcritic b/cookbooks/switch2osm/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/switch2osm/.foodcritic +++ b/cookbooks/switch2osm/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/switch2osm/metadata.rb b/cookbooks/switch2osm/metadata.rb index e5a82aba0..9bfba1235 100644 --- a/cookbooks/switch2osm/metadata.rb +++ b/cookbooks/switch2osm/metadata.rb @@ -1,8 +1,9 @@ name "switch2osm" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures servers for switch2osm" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "wordpress" diff --git a/cookbooks/sysctl/.foodcritic b/cookbooks/sysctl/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/sysctl/.foodcritic +++ b/cookbooks/sysctl/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/sysctl/metadata.rb b/cookbooks/sysctl/metadata.rb index 45a9fd574..01f9d990d 100644 --- a/cookbooks/sysctl/metadata.rb +++ b/cookbooks/sysctl/metadata.rb @@ -1,12 +1,8 @@ name "sysctl" maintainer "Tom Hughes" maintainer_email "tom@compton.nu" -license "Apache 2.0" +license "Apache-2.0" description "Configures kernel parameters" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "0.1" - -attribute "sysctl", - :display_name => "Kernel Parameters", - :description => "Hash of kernel parameter groups", - :type => "hash" +supports "ubuntu" diff --git a/cookbooks/sysfs/.foodcritic b/cookbooks/sysfs/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/sysfs/.foodcritic +++ b/cookbooks/sysfs/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/sysfs/metadata.rb b/cookbooks/sysfs/metadata.rb index 925150b51..ab7cd5435 100644 --- a/cookbooks/sysfs/metadata.rb +++ b/cookbooks/sysfs/metadata.rb @@ -1,7 +1,8 @@ name "sysfs" maintainer "Tom Hughes" maintainer_email "tom@compton.nu" -license "Apache 2.0" +license "Apache-2.0" description "Configures kernel parameters" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/systemd/.foodcritic b/cookbooks/systemd/.foodcritic index b4789ef38..1a4fd3293 100644 --- a/cookbooks/systemd/.foodcritic +++ b/cookbooks/systemd/.foodcritic @@ -1,2 +1,4 @@ ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/systemd/metadata.rb b/cookbooks/systemd/metadata.rb index 7902949d1..32a934ce3 100644 --- a/cookbooks/systemd/metadata.rb +++ b/cookbooks/systemd/metadata.rb @@ -1,7 +1,8 @@ name "systemd" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures systemd units" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/taginfo/.foodcritic b/cookbooks/taginfo/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/taginfo/.foodcritic +++ b/cookbooks/taginfo/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/taginfo/metadata.rb b/cookbooks/taginfo/metadata.rb index 9a747ef52..4e450464e 100644 --- a/cookbooks/taginfo/metadata.rb +++ b/cookbooks/taginfo/metadata.rb @@ -1,20 +1,11 @@ name "taginfo" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures taginfo" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "passenger" depends "git" - -attribute "taginfo", - :display_name => "TAGINFO", - :description => "Hash of TAGINFO attributes", - :type => "hash" - -attribute "taginfo/sites", - :display_name => "Sites", - :description => "Array of TAGINFO sites to setup", - :default => [] diff --git a/cookbooks/tile/.foodcritic b/cookbooks/tile/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/tile/.foodcritic +++ b/cookbooks/tile/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/tile/metadata.rb b/cookbooks/tile/metadata.rb index 1878fcd91..fd661ca07 100644 --- a/cookbooks/tile/metadata.rb +++ b/cookbooks/tile/metadata.rb @@ -1,10 +1,11 @@ name "tile" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures tile servers" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "git" depends "nodejs" diff --git a/cookbooks/tilecache/.foodcritic b/cookbooks/tilecache/.foodcritic index d8973b2fb..53c271a0f 100644 --- a/cookbooks/tilecache/.foodcritic +++ b/cookbooks/tilecache/.foodcritic @@ -2,3 +2,5 @@ ~FC003 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/tilecache/metadata.rb b/cookbooks/tilecache/metadata.rb index 6faf87174..d846c6a3d 100644 --- a/cookbooks/tilecache/metadata.rb +++ b/cookbooks/tilecache/metadata.rb @@ -1,10 +1,11 @@ name "tilecache" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures a tile cache" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "ssl" depends "squid" depends "nginx" diff --git a/cookbooks/tilelog/.foodcritic b/cookbooks/tilelog/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/tilelog/.foodcritic +++ b/cookbooks/tilelog/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/tilelog/metadata.rb b/cookbooks/tilelog/metadata.rb index df11c69aa..03e625886 100644 --- a/cookbooks/tilelog/metadata.rb +++ b/cookbooks/tilelog/metadata.rb @@ -1,9 +1,10 @@ name "tilelog" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures tile log analysis" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "git" depends "tools" diff --git a/cookbooks/tools/.foodcritic b/cookbooks/tools/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/tools/.foodcritic +++ b/cookbooks/tools/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/tools/metadata.rb b/cookbooks/tools/metadata.rb index a34657f76..47873a625 100644 --- a/cookbooks/tools/metadata.rb +++ b/cookbooks/tools/metadata.rb @@ -1,7 +1,8 @@ name "tools" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs system administration tools" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/trac/.foodcritic b/cookbooks/trac/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/trac/.foodcritic +++ b/cookbooks/trac/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/trac/metadata.rb b/cookbooks/trac/metadata.rb index 442b55a1d..c8d7fd0d7 100644 --- a/cookbooks/trac/metadata.rb +++ b/cookbooks/trac/metadata.rb @@ -1,8 +1,9 @@ name "trac" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures trac servers" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" diff --git a/cookbooks/web/.foodcritic b/cookbooks/web/.foodcritic index e32acd81f..03f7b709f 100644 --- a/cookbooks/web/.foodcritic +++ b/cookbooks/web/.foodcritic @@ -2,3 +2,5 @@ ~FC015 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb index 93ea61da4..637d374b7 100644 --- a/cookbooks/web/metadata.rb +++ b/cookbooks/web/metadata.rb @@ -1,10 +1,11 @@ name "web" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures www.openstreetmap.org servers" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.1" +supports "ubuntu" depends "apache" depends "passenger" depends "git" diff --git a/cookbooks/wiki/.foodcritic b/cookbooks/wiki/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/wiki/.foodcritic +++ b/cookbooks/wiki/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/wiki/metadata.rb b/cookbooks/wiki/metadata.rb index 0bf885ab2..2188662ee 100644 --- a/cookbooks/wiki/metadata.rb +++ b/cookbooks/wiki/metadata.rb @@ -1,9 +1,10 @@ name "wiki" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures servers for wiki.openstreetmap.org" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "mediawiki" depends "squid" diff --git a/cookbooks/wordpress/.foodcritic b/cookbooks/wordpress/.foodcritic index 26719e832..af9a69afb 100644 --- a/cookbooks/wordpress/.foodcritic +++ b/cookbooks/wordpress/.foodcritic @@ -2,3 +2,5 @@ ~FC021 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/wordpress/metadata.rb b/cookbooks/wordpress/metadata.rb index b9181ed5e..920933470 100644 --- a/cookbooks/wordpress/metadata.rb +++ b/cookbooks/wordpress/metadata.rb @@ -1,10 +1,11 @@ name "wordpress" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures Wordpress" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache" depends "chef" depends "mysql" diff --git a/cookbooks/xinetd/.foodcritic b/cookbooks/xinetd/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/xinetd/.foodcritic +++ b/cookbooks/xinetd/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/xinetd/metadata.rb b/cookbooks/xinetd/metadata.rb index 79f029256..2b1e6e440 100644 --- a/cookbooks/xinetd/metadata.rb +++ b/cookbooks/xinetd/metadata.rb @@ -1,7 +1,8 @@ name "xinetd" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Configures xinetd" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" diff --git a/cookbooks/yournavigation/.foodcritic b/cookbooks/yournavigation/.foodcritic index a085263c8..0c118ec61 100644 --- a/cookbooks/yournavigation/.foodcritic +++ b/cookbooks/yournavigation/.foodcritic @@ -1,3 +1,5 @@ ~FC001 ~FC064 ~FC065 +~FC066 +~FC071 diff --git a/cookbooks/yournavigation/metadata.rb b/cookbooks/yournavigation/metadata.rb index 24c6cc843..f56c80310 100644 --- a/cookbooks/yournavigation/metadata.rb +++ b/cookbooks/yournavigation/metadata.rb @@ -1,8 +1,9 @@ name "yournavigation" maintainer "OpenStreetMap Administrators" maintainer_email "admins@openstreetmap.org" -license "Apache 2.0" +license "Apache-2.0" description "Installs and configures yournavigation servers" long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) version "1.0.0" +supports "ubuntu" depends "apache"