diff --git a/Batali b/Batali index 0692a8a..a500d30 100644 --- a/Batali +++ b/Batali @@ -36,5 +36,6 @@ Batali.define do cookbook 'omnibus_updater', '~> 1.0.4' cookbook 'timezone-ii' cookbook 'nodejs', '~> 2.4.4' + cookbook 'ark' end diff --git a/batali.manifest b/batali.manifest index b3b2346..d903336 100644 --- a/batali.manifest +++ b/batali.manifest @@ -2,109 +2,57 @@ "infrastructure": false, "cookbook": [ { - "name": "php-fpm", + "name": "mediawiki", "dependencies": [ [ - "apt", + "apache2", "> 0" ], - [ - "yum", - ">= 3.0" - ] - ], - "version": "0.7.5", - "source": { - "url": "https://github.com/67P/cookbook-php-fpm.git", - "ref": "00ae43a225cf23fd3ed937f27ab25aba8d812db9", - "type": "Batali::Source::Git", - "subdirectory": null - } - }, - { - "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": "yum", - "dependencies": [ - - ], - "version": "3.10.0", - "source": { - "type": "Batali::Source::Site", - "url": "https://supermarket.chef.io:443/api/v1/cookbooks/yum/versions/3.10.0/download", - "version": "3.10.0" - } - }, - { - "name": "wordpress", - "dependencies": [ [ "php", "> 0" ], [ - "openssl", + "mysql", "> 0" ], - [ - "apache2", - ">= 2.0.0" - ], [ "database", - ">= 1.6.0" - ], - [ - "mysql", - ">= 6.0" - ], - [ - "mysql2_chef_gem", - "~> 1.0.1" - ], - [ - "build-essential", "> 0" ], - [ - "iis", - ">= 1.6.2" - ], - [ - "tar", - ">= 0.3.1" - ], [ "nginx", - "~> 2.7.4" + "> 0" + ], + [ + "mysql2_chef_gem", + "> 0" ], [ "php-fpm", "> 0" - ], - [ - "selinux", - "~> 0.7" ] ], - "version": "3.0.0", + "version": "0.2.0", "source": { - "url": "https://github.com/67P/wordpress-cookbook.git", - "ref": "bc6a108fcfb05c3fafd903bcf81ac33617e6cef9", + "url": "https://github.com/67P/mediawiki-cookbook.git", + "ref": "b76104ab975ed95e238c10ae49722f0dacd7c0b2", "type": "Batali::Source::Git", "subdirectory": null } }, + { + "name": "apache2", + "dependencies": [ + + ], + "version": "3.1.0", + "source": { + "type": "Batali::Source::Site", + "url": "https://supermarket.chef.io:443/api/v1/cookbooks/apache2/versions/3.1.0/download", + "version": "3.1.0" + } + }, { "name": "php", "dependencies": [ @@ -217,6 +165,18 @@ "version": "0.1.21" } }, + { + "name": "yum", + "dependencies": [ + + ], + "version": "3.10.0", + "source": { + "type": "Batali::Source::Site", + "url": "https://supermarket.chef.io:443/api/v1/cookbooks/yum/versions/3.10.0/download", + "version": "3.10.0" + } + }, { "name": "smf", "dependencies": [ @@ -301,33 +261,6 @@ "version": "4.1.6" } }, - { - "name": "openssl", - "dependencies": [ - [ - "chef-sugar", - ">= 3.1.1" - ] - ], - "version": "4.4.0", - "source": { - "type": "Batali::Source::Site", - "url": "https://supermarket.chef.io:443/api/v1/cookbooks/openssl/versions/4.4.0/download", - "version": "4.4.0" - } - }, - { - "name": "apache2", - "dependencies": [ - - ], - "version": "3.1.0", - "source": { - "type": "Batali::Source::Site", - "url": "https://supermarket.chef.io:443/api/v1/cookbooks/apache2/versions/3.1.0/download", - "version": "3.1.0" - } - }, { "name": "database", "dependencies": [ @@ -367,61 +300,30 @@ } }, { - "name": "mysql2_chef_gem", - "dependencies": [ - [ - "build-essential", - ">= 0.0.0" - ], - [ - "mysql", - "~> 6.0" - ], - [ - "mariadb", - ">= 0.0.0" - ] - ], - "version": "1.0.2", - "source": { - "type": "Batali::Source::Site", - "url": "https://supermarket.chef.io:443/api/v1/cookbooks/mysql2_chef_gem/versions/1.0.2/download", - "version": "1.0.2" - } - }, - { - "name": "mariadb", - "dependencies": [ - [ - "apt", - ">= 0.0.0" - ], - [ - "yum", - ">= 0.0.0" - ], - [ - "yum-epel", - ">= 0.0.0" - ] - ], - "version": "0.3.1", - "source": { - "type": "Batali::Source::Site", - "url": "https://supermarket.chef.io:443/api/v1/cookbooks/mariadb/versions/0.3.1/download", - "version": "0.3.1" - } - }, - { - "name": "tar", + "name": "apt", "dependencies": [ ], - "version": "0.7.0", + "version": "2.9.2", "source": { "type": "Batali::Source::Site", - "url": "https://supermarket.chef.io:443/api/v1/cookbooks/tar/versions/0.7.0/download", - "version": "0.7.0" + "url": "https://supermarket.chef.io:443/api/v1/cookbooks/apt/versions/2.9.2/download", + "version": "2.9.2" + } + }, + { + "name": "openssl", + "dependencies": [ + [ + "chef-sugar", + ">= 3.1.1" + ] + ], + "version": "4.4.0", + "source": { + "type": "Batali::Source::Site", + "url": "https://supermarket.chef.io:443/api/v1/cookbooks/openssl/versions/4.4.0/download", + "version": "4.4.0" } }, { @@ -525,6 +427,144 @@ "version": "0.2.0" } }, + { + "name": "mysql2_chef_gem", + "dependencies": [ + [ + "build-essential", + ">= 0.0.0" + ], + [ + "mysql", + "~> 6.0" + ], + [ + "mariadb", + ">= 0.0.0" + ] + ], + "version": "1.0.2", + "source": { + "type": "Batali::Source::Site", + "url": "https://supermarket.chef.io:443/api/v1/cookbooks/mysql2_chef_gem/versions/1.0.2/download", + "version": "1.0.2" + } + }, + { + "name": "mariadb", + "dependencies": [ + [ + "apt", + ">= 0.0.0" + ], + [ + "yum", + ">= 0.0.0" + ], + [ + "yum-epel", + ">= 0.0.0" + ] + ], + "version": "0.3.1", + "source": { + "type": "Batali::Source::Site", + "url": "https://supermarket.chef.io:443/api/v1/cookbooks/mariadb/versions/0.3.1/download", + "version": "0.3.1" + } + }, + { + "name": "php-fpm", + "dependencies": [ + [ + "apt", + "> 0" + ], + [ + "yum", + ">= 3.0" + ] + ], + "version": "0.7.5", + "source": { + "url": "https://github.com/67P/cookbook-php-fpm.git", + "ref": "00ae43a225cf23fd3ed937f27ab25aba8d812db9", + "type": "Batali::Source::Git", + "subdirectory": null + } + }, + { + "name": "wordpress", + "dependencies": [ + [ + "php", + "> 0" + ], + [ + "openssl", + "> 0" + ], + [ + "apache2", + ">= 2.0.0" + ], + [ + "database", + ">= 1.6.0" + ], + [ + "mysql", + ">= 6.0" + ], + [ + "mysql2_chef_gem", + "~> 1.0.1" + ], + [ + "build-essential", + "> 0" + ], + [ + "iis", + ">= 1.6.2" + ], + [ + "tar", + ">= 0.3.1" + ], + [ + "nginx", + "~> 2.7.4" + ], + [ + "php-fpm", + "> 0" + ], + [ + "selinux", + "~> 0.7" + ] + ], + "version": "3.0.0", + "source": { + "url": "https://github.com/67P/wordpress-cookbook.git", + "ref": "bc6a108fcfb05c3fafd903bcf81ac33617e6cef9", + "type": "Batali::Source::Git", + "subdirectory": null + } + }, + { + "name": "tar", + "dependencies": [ + + ], + "version": "0.7.0", + "source": { + "type": "Batali::Source::Site", + "url": "https://supermarket.chef.io:443/api/v1/cookbooks/tar/versions/0.7.0/download", + "version": "0.7.0" + } + }, { "name": "selinux", "dependencies": [ @@ -537,44 +577,6 @@ "version": "0.9.0" } }, - { - "name": "mediawiki", - "dependencies": [ - [ - "apache2", - "> 0" - ], - [ - "php", - "> 0" - ], - [ - "mysql", - "> 0" - ], - [ - "database", - "> 0" - ], - [ - "nginx", - "> 0" - ], - [ - "mysql2_chef_gem", - "> 0" - ], - [ - "php-fpm", - "> 0" - ] - ], - "version": "0.2.0", - "source": { - "type": "Batali::Source::Path", - "path": "/Users/kare/code/kosmos/cookbooks/mediawiki-cookbook" - } - }, { "name": "postfix", "dependencies": [