Fix new foodcritic warnings

diff --git a/cookbooks/accounts/.foodcritic b/cookbooks/accounts/.foodcritic
index d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 f85cff46527228c71481104b3aa8aa665cc0b4b2..6d458937e3d178ef9955a33acee1ab0b67220b2d 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 635f9cfca31528d69459ffa24f0372e416563f73..b944ae52420776c83a09c866f7d3c6e63b9563b1 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..6f7140762a8ed2c800450009eeb55f94816b0ae9 100644 (file)
--- 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 d9661aae252178bf9a21577510fd077acf31b435..7c86a96150964b8a74f67c131559a25392dd9706 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 ed57e3616aee1a69329b27cab275cae1cb90472a..b11c4f043848c2ad456da28798ce61d011609e61 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 3488028c291d13eaa7e601c8f4f1ef5b82e1d11c..dd8792bbe5fa904ca0e5413fd4b3dc22c63cc87c 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 0ac7d090374806ecf7bae0248c76dc0a5949ba35..d2999707ee523041e1944b917c04f6775b065dce 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 2461ead90d858ff9a1acba7c8c29bd43a37d4918..53d183969bcf07f7ae33ae25fbe07c472c0707b0 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 444522c49063758e82e407611d4cadef85cf5c8a..2e65ef58f8172ea1baf55bcf3bcc842d08b210ae 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 e43f04715d3bb8688334ad00f14ba3bc843832eb..57172dafe8a40ddff875068151dde3c0902f760f 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 9b47426d08435899b87ea5c880276268f4d91122..bf73c7650a5d8bb90209ff275140baa3ef31116d 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 c144002b0f0ea8c316b900f6cd356bef6db3ab0c..cd16f87dd312e0e77ee9eabdb9ae8af59b68f3a8 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 a93bc90348bba5e2b1e32314831bee541b3c7f99..2a7f0c69498b0cda2c112015b530d5705ff6866a 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 93702571b5ba38a90a9e3fa9f945641afc6d841f..56eff35ae4bb1faa327e4a66b72a2cd7e703022b 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 87e069b20ba1a80808e34204249312345d981a1a..a217b49e8b7ed813c073c5093a046d29e598432d 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 7f661d662e7ce9e2a2a0711b0f812a7a5e51086b..c61b6d664d0823e627c373bd1f0aff94ad6e17a6 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 6a0eef09a66e38e55ab8449a226f22c43dc49d96..94c6099c00a6d3baa22f6ad8aa29cd06a0aba4b7 100644 (file)
--- 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 05e4c9141a0d4dab81c3f11ffe1d8080cd63ba66..15ed978ff8e528bf347efc14c68139e11485cd7f 100644 (file)
--- 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 078fec273ad0443534ca3727abb84e1b7347c37c..04855143ec55af1a7f28b65a41433474a2b1b2bd 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 bf14fba3af05feca04723776227acdcd4cd45cc3..1d956c02a516ff978963f3b7fc013c9dc2d42a88 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 ed1d59da5e32046646b974a1d4aa36bab7ec3a1c..eb25776e1ace635c450434c49babc7ea01cec59d 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 8f62b08cd8388f310c5e4f6907e82f27cd9402ca..472d3518f36ce063c64dbafd29ee6a2163a6a14b 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 ea3407d02b2236314a4a0490392f8e42608f4920..a7a0ffcdbd083c78d92394afdb5585d88b66f0a3 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 3a2bec7657a8afed39ba1a8ac937b0dd89ab6106..2b2b7c735773b1edc6aed8210493b7f745951e03 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 9dd9a0a3701fed9991e068697c21063c5478225e..bbc676a39dbb5a0ccc3e2d5e008ecf1876a0e05f 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 fa82a439c5db02c11da7d821c72f824ad7fc1f40..704f32750c68b93d58b93e0b5a2a570678e08045 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 53a5fb75f5ee7ccd7c57f8c49d0eccdccbde6d82..43c89179d38248880f7688c9a8aece84adb26ab0 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 ae6806f50ae74a61e41e9785550d317e301f347c..a702ae0c6e7fc79fe92903a189f26babbe24fbe5 100644 (file)
--- 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 5c5875e10a6a30da5e2dc7a9ec534767a5742ea4..e14faa44ffadda790c659cb74c2d5dbaf6f816c5 100644 (file)
--- 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 74a4a1d89e4aed30653144d83197bf21e0a853d2..10074efc4e0ba86cdff0dbd9e7e44bcc549d5083 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 42d6738a61943e8e4bf3d5847dcfad6870207f0c..12e8e0cd771cabf5d136189c544fd07fb1608403 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 4e1c8833b39ebb6602dddadf805886e420aca459..a8509ca26556ddd378ce32e1455d4e8919c4f3c2 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 69f1d32db47f6bec52231acf785315fd6a1a229f..32412e1ce9b04d80e25b14b2ff6f5fdd79e52172 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 5e4405a218715ffec5717be8d6edc2d9fb12da37..8fd573da09f8a18cf2f5c739bb90b037b2a778f2 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 0ba3d6a2163261e0a7c2c8ad170c51ddfd865653..b6bb6f6138af30cbf27a9241646dd4320ebb5108 100644 (file)
--- 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 26719e832809179bd8996ff850845a98508358e9..af9a69afb2c9444f9e351c7ea3ac884ae65cf38a 100644 (file)
--- 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 46daf9a65b4657af8450bffe544b6406fe69f8fa..f0440f0eda6ef59c31090671fa43cd6e359be332 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 7abd699a4c4c70b1af0f489091a4dddbc6531a1f..6bdf0775fe1d5e967086ead1501022ff7ecbb267 100644 (file)
--- 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 6f1cca4830a9da936b8da1ec83e6fab810833bbc..8f83d01e267a30f59811f5e74fc134759c8b1a13 100644 (file)
--- 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 b45c7575cfe20783097a75484c6476649a9d7208..314a0b2b312b5e517a5817f78e48e36b0dd108d4 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 18b2492d7912c67cdfc5a94d9eced773a53c57cb..0641d5bf3c8b796537ec80214cb04c3b13337988 100644 (file)
--- 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 8addb0b7626e938b705f401400d3bd313bab7e4b..c8f7322db6093758a054486215c2b3139f1c77bb 100644 (file)
--- 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 bbe92adce0954b78acc8c12e8849ffdfd36c9f08..04002fc8eed0b3f4184ca4458fb1f559365f4840 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 b2038e83208e280da3a28ae2e5cfb17ed39ca474..fa8e7e47bb2e0d8367f4cb5f9fce83cfa33f133a 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 2710e6c54b7e7f8c18651f1678f6324438566e62..7c1171f618d37c0bac3111aef4396bad887dd371 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 702c77c3b8e4e5989c9ad53d76983d2f1ab68247..57c121f3cbc58b00ff936b20b4cfa0556c9c2ab5 100644 (file)
--- 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 9d83f40ffe755cd2b42ce1cf2a34fca1936d08dd..0ecd08eba1890d1dbf8488b6957cf119bf450f89 100644 (file)
--- 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 243411216d748ee682e7a16f4a97a858cb0ae245..db9424024730638ed13dc6b4a0ffcf0083eec2c1 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 24dd31986d5ee5ab8600b34132ceb346b0877113..20f5012c9056d798ef8ae22d8727e35edd9e7714 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 484d0d23d66f8e4c479a7b684dc45e2620616ef7..a1d8dda225d615402b2e6c691b0f0a90945ecee7 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 426a1ad5c946b71b183823267519fcd9da8144f9..0aab6c22335b551c2e855565ba25c678fdaea65a 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 aec91a6282d7a58915972e3a66ccc1095f33125b..37cda7e7c8ae7fd8439d123e7b103c0de7f21fc9 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 7478cdec4e8d0a6711c8e92239310d74ba37a942..974d2e703c3235c778273aac893fdb5533be8479 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 b5c22ec53f483d4fb3ee8a91c8589ec075f4a96e..d61a694f23ee25fb10b54f0fa3fabda3cd5eea3a 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 75ca0ba39175cb4a52347637d9a9ad6c7b6b4d93..a5cda8d479c0dab7223ab0c45f028d5aed9b1656 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 bb738af7669197617c84899003106ab5f00b087d..c85c7a990189474baca9abe3941b625850092232 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 86976a6f9ac1915e4fa99f7cb7c311619883760b..7eeade7c9b8fee62cf95d3177bcfbff571d24f70 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 937c95fe92b89c3aca3104a6f2841ba28b546ea5..b1d06b595d635520177c8792627b52b98ebfb790 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 fd4f289651004b207097ffd514160fc4bb0afcc8..0745806c3e5b9ce971c10a1089a4cb86a2f16310 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 d26c7ff8cfea6ff26832fc8e10c5d475240285eb..2bd8fd1c703265d37a23c9ac10dbd6f484ec78e2 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 07dbc4d45688929526eb44c6a5c265d0193af4a8..be4903e90a15d0c743a8add8a150a82c33ad2483 100644 (file)
--- 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 998d2bed3bb55f550fbe9be88c8df99144fd6792..1a8402b4b2bf7cf073ae95ea999158505a093479 100644 (file)
--- 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 e15a493a0e7be421afa4d3acb8652f22b9efaf21..c50cb27d542ad36517f90fb7a7cba66ff18d64f1 100644 (file)
--- 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 848b7630ec745e4d347fad9877a72819cb151b9d..87580699013f1552918cf5f1a69f9279cf40f66a 100644 (file)
--- 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 a2d4af925a7d449e5b1c8008b1838eec7fb1e53a..22ff396004a95cba23b42f781513644409f8c070 100644 (file)
--- 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 5df0f3847845d07a19fb188bc25b97540587e5cb..22d01a4dca9e41fc82e8ad099af3e4169e7e75bd 100644 (file)
--- 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 1a63f3ac889fa8a6a8e8fba5cfeb26e23998f554..1e8f3972ce57a68893196267494b347c89125a5f 100644 (file)
--- 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 49ff80e4f3d8afba55ed11786022c50022a4cffe..f01e219129062056bc62f976013013ec24188b33 100644 (file)
--- 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 8c876f4739aba8f986c3d5b824284543764716de..a1363424d6d190699a56c4ea8aa56f12db322b11 100644 (file)
--- 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 167a68bfdc57f56df0635924bf10e248f8f59a4f..93bb021ce006d8813c2f0e35183e01d1b2eb683f 100644 (file)
--- 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 f5fefa35aa1a2ab37b2b2963b68a7223c1fad09a..5cbb94d58c6465cc342e7a02d83e33bcc13d1293 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 789050a15e28705792efcaeb7f2ace5d75a309e6..4158ef8bdbdc02edcb90eef8d2d7a1f0f52140e4 100644 (file)
--- 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 3a766957e55ddefc6f97f5b9247a512fd8899641..76a6af7ec4a7aad7c64635b98f8ef5f81ab78df4 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 8b1be50f19b99a7c0d545753edb4dc035c670553..727bcfec05e7a01a9696310b16faa2e88b19c818 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 0aeda0cf1d4a610d740f7fe34bda8a73ea365f36..1f3b344fab986db2ec7a5008e2bfe64bf57f4a3b 100644 (file)
--- 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 4081e370419f07c5764a7667d257696405491a0f..b0f9b4b7d06f2d6f4ba3eaf35a94be54c709c047 100644 (file)
--- 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 af6c1cf4230d3db658bf46514a44c12d1a55f1da..65c55cf2c6e6caa44e1fb755513d1adb140b5a20 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 58dfbb217fda4c86ad9087c77429c8258464c8d5..95cde5e9782d4beb031050d72720e4fe6e517e2a 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 19f335ba885701ce002ea46a4884d963b6599e96..fc72cc64a5cbf54d887bced89cbf4605c26090f3 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 9e9397017ca18aaf50c8a6afad0b090c8959858c..763b57d9ca91fbc210f4cb125a0e10547492b659 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 89f6df9d2231a3d2e41dd190dbc6ac3631e5bee7..cad9341504227e619699a5823ea221401be82692 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 fcc8589a2bfd27b89f7d1cb70d1fd796f07cab21..68bcf9e54ebcac53a062b6c4d22acb6c1d6f131d 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 9ef4ba68824cfbd9b0687632fdb2ba5f7c77a39c..859d59b458b5392bfaf89a2e1e7e747603249e96 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 8886f6b938ae3efd85b7925bbb8aa14971ba1b15..64a49d98996721316bd9024f318b9337de9d2e54 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 6c22755c53a03ff57849985ca627743be2796f25..0b65379d9c2c1de6c07623c13f48205f1b3e5cf0 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 e5a82aba059d0eb90cc3cea46af0e07500dd896a..9bfba123590973427275cea7cf00d0eca1718a2d 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 45a9fd5740ad41edd9ce75c6ae54a1eb9966835c..01f9d990d3f576cfea1583713cec406aaabc003e 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 925150b511aa6b272799554588782c3dffc7a8d7..ab7cd54352dbd0be9ddb60a25418f75e8e53121a 100644 (file)
--- 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 b4789ef38a834296a4a75b240504fe69c329dde9..1a4fd329376b56531fece1f0e17c954dc93247eb 100644 (file)
--- 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 7902949d1ac66e9df9dcad5da00313fb85189a68..32a934ce388149fd5a1383986dc0ad86b62d6904 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 9a747ef52c06da64fa904e339ec7ec265b3b32fa..4e450464ed347cea080f0498f5736fa964f39d24 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 1878fcd91ae8e83a8931c2b456cc9f54b4b6dbcb..fd661ca072f7e331804ac28ef92ddae4b6a49f1f 100644 (file)
--- 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 d8973b2fb531e67e4180a611498f340246d1ab3f..53c271a0fbce34c5a8eaf13bf256b108ec32abc0 100644 (file)
--- 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 6faf8717411617f76198d260183f8f0097c3df24..d846c6a3dc2ee349a29d11ae7773078f1d319de3 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 df11c69aa5bddb3aedc9f07b2beee1636787aef3..03e625886295a5cab45ac917cc15349233344ffa 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 a34657f761bde0a9757d0a0bea39284ecb2d7919..47873a6250abf315b74313fa198af9296ff01cf7 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 442b55a1dba872041052fe9820691f1ee9abc3d1..c8d7fd0d73cf29cac2410670463460b48354220e 100644 (file)
--- 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 e32acd81f21cfca311201edf4042971a9f41981b..03f7b709fcb5e4efd07fc828e96d1e6ad7513046 100644 (file)
--- 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 93ea61da44f38f717366d64a2101dd1dd085fd45..637d374b70bf3f587bdb3438448f7023a425db6b 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 0bf885ab2e9f2e805933f37a1df80199c6a3deae..2188662eee0857b9993fb59001e54153f53de22f 100644 (file)
--- 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 26719e832809179bd8996ff850845a98508358e9..af9a69afb2c9444f9e351c7ea3ac884ae65cf38a 100644 (file)
--- 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 b9181ed5e86537f254ebade7441965372b16f8dd..92093347037e9729d02b5b14815a1a45391ee862 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 79f029256a742b6be25633ade4fd367f7f2fd309..2b1e6e440eb9fd2ee7709e694b23750b1bf8182a 100644 (file)
--- 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 a085263c88d33bf5f31d0db1a6beb8cd2a9ef9f6..0c118ec613cc43f8a27ea3b2a3d93b899e2db0fa 100644 (file)
--- 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 24c6cc843b2189e3c46d4593f2645188beda754d..f56c80310de42b0a2dd93766c5a7ee6a17336adb 100644 (file)
--- 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"