Merge branch 'master' into feature/ubuntu-16.04

This commit is contained in:
Greg Karékinian
2017-06-09 16:36:19 +02:00
873 changed files with 38209 additions and 15880 deletions

View File

@@ -21,7 +21,7 @@
"> 0"
],
[
"nginx",
"chef_nginx",
"> 0"
],
[
@@ -33,10 +33,10 @@
"> 0"
]
],
"version": "0.2.0",
"version": "0.3.0",
"source": {
"url": "https://github.com/67P/mediawiki-cookbook.git",
"ref": "41d3c5129b5a6cd9c473e99339885bc1feac5d57",
"ref": "8da675abc28b1b1ccf00d32df8a1923208e762c9",
"type": "Batali::Source::Git",
"subdirectory": null
}
@@ -100,11 +100,11 @@
">= 1.1"
]
],
"version": "8.0.0",
"version": "8.0.1",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/build-essential/versions/8.0.0/download",
"version": "8.0.0"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/build-essential/versions/8.0.1/download",
"version": "8.0.1"
}
},
{
@@ -115,11 +115,11 @@
">= 1.2.2"
]
],
"version": "1.0.4",
"version": "2.0.2",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/seven_zip/versions/1.0.4/download",
"version": "1.0.4"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/seven_zip/versions/2.0.2/download",
"version": "2.0.2"
}
},
{
@@ -268,142 +268,78 @@
"name": "postgresql",
"dependencies": [
[
"apt",
">= 1.9.0"
"compat_resource",
">= 12.16.3"
],
[
"build-essential",
">= 0.0.0"
">= 2.0.0"
],
[
"openssl",
"~> 4.0"
">= 4.0"
]
],
"version": "4.0.0",
"version": "6.1.1",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/postgresql/versions/4.0.0/download",
"version": "4.0.0"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/postgresql/versions/6.1.1/download",
"version": "6.1.1"
}
},
{
"name": "apt",
"name": "compat_resource",
"dependencies": [
],
"version": "2.9.2",
"version": "12.19.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/apt/versions/2.9.2/download",
"version": "2.9.2"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/compat_resource/versions/12.19.0/download",
"version": "12.19.0"
}
},
{
"name": "openssl",
"dependencies": [
[
"chef-sugar",
">= 3.1.1"
]
],
"version": "4.4.0",
"version": "7.0.1",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/openssl/versions/4.4.0/download",
"version": "4.4.0"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/openssl/versions/7.0.1/download",
"version": "7.0.1"
}
},
{
"name": "nginx",
"name": "chef_nginx",
"dependencies": [
[
"apt",
"~> 2.2"
],
[
"bluepill",
"~> 2.3"
],
[
"build-essential",
"~> 2.0"
">= 0.0.0"
],
[
"ohai",
"~> 2.0"
],
[
"runit",
"~> 1.2"
">= 4.1.0"
],
[
"yum-epel",
"~> 0.3"
]
],
"version": "2.7.6",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/nginx/versions/2.7.6/download",
"version": "2.7.6"
}
},
{
"name": "bluepill",
"dependencies": [
">= 0.0.0"
],
[
"rsyslog",
">= 2.0"
]
],
"version": "2.4.3",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/bluepill/versions/2.4.3/download",
"version": "2.4.3"
}
},
{
"name": "rsyslog",
"dependencies": [
],
"version": "2.2.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/rsyslog/versions/2.2.0/download",
"version": "2.2.0"
}
},
{
"name": "build-essential",
"dependencies": [
"compat_resource",
">= 12.16.3"
],
[
"7-zip",
"zypper",
">= 0.0.0"
]
],
"version": "2.4.0",
"version": "6.0.2",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/build-essential/versions/2.4.0/download",
"version": "2.4.0"
}
},
{
"name": "7-zip",
"dependencies": [
[
"windows",
">= 1.2.2"
]
],
"version": "1.0.2",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/7-zip/versions/1.0.2/download",
"version": "1.0.2"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/chef_nginx/versions/6.0.2/download",
"version": "6.0.2"
}
},
{
@@ -411,38 +347,23 @@
"dependencies": [
],
"version": "2.1.0",
"version": "5.0.4",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/ohai/versions/2.1.0/download",
"version": "2.1.0"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/ohai/versions/5.0.4/download",
"version": "5.0.4"
}
},
{
"name": "runit",
"dependencies": [
[
"packagecloud",
">= 0.0.0"
]
],
"version": "1.7.6",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/runit/versions/1.7.6/download",
"version": "1.7.6"
}
},
{
"name": "packagecloud",
"name": "zypper",
"dependencies": [
],
"version": "0.2.0",
"version": "0.4.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/packagecloud/versions/0.2.0/download",
"version": "0.2.0"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/zypper/versions/0.4.0/download",
"version": "0.4.0"
}
},
{
@@ -491,6 +412,18 @@
"version": "0.3.1"
}
},
{
"name": "apt",
"dependencies": [
],
"version": "2.9.2",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/apt/versions/2.9.2/download",
"version": "2.9.2"
}
},
{
"name": "php-fpm",
"dependencies": [
@@ -550,8 +483,8 @@
">= 0.3.1"
],
[
"nginx",
"~> 2.7.4"
"chef_nginx",
"> 0"
],
[
"php-fpm",
@@ -562,10 +495,10 @@
"~> 0.7"
]
],
"version": "3.0.0",
"version": "3.1.0",
"source": {
"url": "https://github.com/67P/wordpress-cookbook.git",
"ref": "d6401db517476e6f3ab36aa92dfc0f5ed6a8a264",
"ref": "a80b8a17fb823a01b769f690349d745c40fff04c",
"type": "Batali::Source::Git",
"subdirectory": null
}
@@ -607,40 +540,405 @@
}
},
{
"name": "unattended-upgrades",
"name": "poise-ruby-build",
"dependencies": [
[
"apt",
">= 0.0.0"
"poise",
"~> 2.0"
],
[
"poise-build-essential",
"~> 1.0"
],
[
"poise-git",
"~> 1.0"
],
[
"poise-ruby",
"~> 2.1"
]
],
"version": "0.1.2",
"version": "1.1.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/unattended-upgrades/versions/0.1.2/download",
"version": "0.1.2"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise-ruby-build/versions/1.1.0/download",
"version": "1.1.0"
}
},
{
"name": "application_nodejs",
"name": "poise",
"dependencies": [
],
"version": "2.7.2",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise/versions/2.7.2/download",
"version": "2.7.2"
}
},
{
"name": "poise-build-essential",
"dependencies": [
[
"nodejs",
"> 0"
"poise",
"~> 2.6"
]
],
"version": "1.0.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise-build-essential/versions/1.0.0/download",
"version": "1.0.0"
}
},
{
"name": "poise-git",
"dependencies": [
[
"poise",
"~> 2.6"
],
[
"poise-languages",
"~> 2.1"
]
],
"version": "1.0.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise-git/versions/1.0.0/download",
"version": "1.0.0"
}
},
{
"name": "poise-languages",
"dependencies": [
[
"poise",
"~> 2.5"
],
[
"poise-archive",
"~> 1.0"
]
],
"version": "2.1.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise-languages/versions/2.1.0/download",
"version": "2.1.0"
}
},
{
"name": "poise-archive",
"dependencies": [
[
"poise",
"~> 2.6"
]
],
"version": "1.4.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise-archive/versions/1.4.0/download",
"version": "1.4.0"
}
},
{
"name": "poise-ruby",
"dependencies": [
[
"poise",
"~> 2.0"
],
[
"poise-languages",
"~> 2.0"
]
],
"version": "2.2.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise-ruby/versions/2.2.0/download",
"version": "2.2.0"
}
},
{
"name": "application",
"dependencies": [
[
"poise",
"~> 2.4"
],
[
"poise-service",
"~> 1.0"
]
],
"version": "5.2.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/application/versions/5.2.0/download",
"version": "5.2.0"
}
},
{
"name": "poise-service",
"dependencies": [
[
"poise",
"~> 2.0"
]
],
"version": "1.4.2",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise-service/versions/1.4.2/download",
"version": "1.4.2"
}
},
{
"name": "application_javascript",
"dependencies": [
[
"poise",
"~> 2.0"
],
[
"application",
"~> 5.0"
],
[
"poise-javascript",
"~> 1.0"
],
[
"poise-service",
"~> 1.0"
]
],
"version": "1.0.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/application_javascript/versions/1.0.0/download",
"version": "1.0.0"
}
},
{
"name": "poise-javascript",
"dependencies": [
[
"poise",
"~> 2.0"
],
[
"poise-languages",
"~> 2.0"
]
],
"version": "1.1.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/poise-javascript/versions/1.1.0/download",
"version": "1.1.0"
}
},
{
"name": "application_ruby",
"dependencies": [
[
"poise",
"~> 2.0"
],
[
"application",
"~> 5.0"
],
[
"poise-ruby",
"~> 2.1"
],
[
"poise-service",
"~> 1.0"
]
],
"version": "4.1.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/application_ruby/versions/4.1.0/download",
"version": "4.1.0"
}
},
{
"name": "application_git",
"dependencies": [
[
"git",
">= 0.0.0"
],
[
"poise",
"~> 2.0"
],
[
"application",
"~> 5.0"
]
],
"version": "1.1.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/application_git/versions/1.1.0/download",
"version": "1.1.0"
}
},
{
"name": "git",
"dependencies": [
[
"build-essential",
">= 0.0.0"
],
[
"dmg",
">= 0.0.0"
],
[
"yum-epel",
">= 0.0.0"
]
],
"version": "6.0.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/git/versions/6.0.0/download",
"version": "6.0.0"
}
},
{
"name": "dmg",
"dependencies": [
],
"version": "4.0.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/dmg/versions/4.0.0/download",
"version": "4.0.0"
}
},
{
"name": "users",
"dependencies": [
],
"version": "5.0.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/users/versions/5.0.0/download",
"version": "5.0.0"
}
},
{
"name": "sudo",
"dependencies": [
],
"version": "3.5.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/sudo/versions/3.5.0/download",
"version": "3.5.0"
}
},
{
"name": "hostname",
"dependencies": [
[
"hostsfile",
">= 0.0.0"
]
],
"version": "0.4.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/hostname/versions/0.4.0/download",
"version": "0.4.0"
}
},
{
"name": "hostsfile",
"dependencies": [
],
"version": "2.4.5",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/hostsfile/versions/2.4.5/download",
"version": "2.4.5"
}
},
{
"name": "redis",
"dependencies": [
[
"apt",
"> 0"
]
],
"version": "2.0.1",
"version": "0.5.6",
"source": {
"url": "https://github.com/67p/application_nodejs.git",
"ref": "0c3494b0cae87bd1e9cbf360e91f1a290b517a66",
"url": "https://github.com/phlipper/chef-redis.git",
"ref": "7476279fc9c8727f082b8d77b5e1922dc2ef437b",
"type": "Batali::Source::Git",
"subdirectory": null
}
},
{
"name": "firewall",
"dependencies": [
[
"chef-sugar",
">= 0.0.0"
]
],
"version": "2.6.1",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/firewall/versions/2.6.1/download",
"version": "2.6.1"
}
},
{
"name": "chef_client_updater",
"dependencies": [
[
"compat_resource",
">= 12.16.3"
]
],
"version": "1.0.2",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/chef_client_updater/versions/1.0.2/download",
"version": "1.0.2"
}
},
{
"name": "timezone-ii",
"dependencies": [
],
"version": "0.2.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/timezone-ii/versions/0.2.0/download",
"version": "0.2.0"
}
},
{
"name": "nodejs",
"dependencies": [
@@ -688,171 +986,38 @@
">= 0.0.0"
]
],
"version": "2.2.1",
"version": "3.0.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/ark/versions/2.2.1/download",
"version": "2.2.1"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/ark/versions/3.0.0/download",
"version": "3.0.0"
}
},
{
"name": "homebrew",
"dependencies": [
[
"build-essential",
">= 2.1.2"
]
],
"version": "2.0.5",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/homebrew/versions/2.0.5/download",
"version": "2.0.5"
}
},
{
"name": "application",
"dependencies": [
],
"version": "4.1.6",
"version": "3.0.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/application/versions/4.1.6/download",
"version": "4.1.6"
}
},
{
"name": "users",
"dependencies": [
],
"version": "4.0.3",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/users/versions/4.0.3/download",
"version": "4.0.3"
}
},
{
"name": "sudo",
"dependencies": [
],
"version": "3.3.1",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/sudo/versions/3.3.1/download",
"version": "3.3.1"
}
},
{
"name": "hostname",
"dependencies": [
[
"hostsfile",
">= 0.0.0"
]
],
"version": "0.4.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/hostname/versions/0.4.0/download",
"version": "0.4.0"
}
},
{
"name": "hostsfile",
"dependencies": [
],
"version": "2.4.5",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/hostsfile/versions/2.4.5/download",
"version": "2.4.5"
}
},
{
"name": "redis",
"dependencies": [
[
"apt",
"> 0"
]
],
"version": "0.5.6",
"source": {
"url": "https://github.com/phlipper/chef-redis.git",
"ref": "7476279fc9c8727f082b8d77b5e1922dc2ef437b",
"type": "Batali::Source::Git",
"subdirectory": null
}
},
{
"name": "ufw",
"dependencies": [
[
"firewall",
">= 2.0"
]
],
"version": "3.1.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/ufw/versions/3.1.0/download",
"version": "3.1.0"
}
},
{
"name": "firewall",
"dependencies": [
[
"chef-sugar",
">= 0.0.0"
]
],
"version": "2.5.4",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/firewall/versions/2.5.4/download",
"version": "2.5.4"
}
},
{
"name": "omnibus_updater",
"dependencies": [
],
"version": "3.0.2",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/omnibus_updater/versions/3.0.2/download",
"version": "3.0.2"
}
},
{
"name": "timezone-ii",
"dependencies": [
],
"version": "0.2.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/timezone-ii/versions/0.2.0/download",
"version": "0.2.0"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/homebrew/versions/3.0.0/download",
"version": "3.0.0"
}
},
{
"name": "logrotate",
"dependencies": [
[
"compat_resource",
">= 0.0.0"
]
],
"version": "1.9.2",
"version": "2.1.0",
"source": {
"type": "Batali::Source::Site",
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/logrotate/versions/1.9.2/download",
"version": "1.9.2"
"url": "https://supermarket.chef.io:443/api/v1/cookbooks/logrotate/versions/2.1.0/download",
"version": "2.1.0"
}
}
]