Skip to content
This repository has been archived by the owner on Oct 5, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release-1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
r8 committed Sep 25, 2015
2 parents 4ce7aa1 + 16e9a12 commit 40a98ca
Show file tree
Hide file tree
Showing 496 changed files with 10,086 additions and 6,966 deletions.
21 changes: 10 additions & 11 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
source "https://supermarket.getchef.com"

cookbook 'apache2', '~> 3.0.1'
cookbook 'apt', '~> 2.6.1'
cookbook 'build-essential', '~> 2.1.3'
cookbook 'composer', '~> 2.0.0'
cookbook 'git', '~> 4.1.0'
cookbook 'apache2', '~> 3.1.0'
cookbook 'apt', '~> 2.8.2'
cookbook 'build-essential', '~> 2.2.3'
cookbook 'composer', '~> 2.2.0'
cookbook 'git', '~> 4.3.4'
cookbook 'magento-toolbox', '~> 0.0.3'
cookbook 'mysql', '~> 6.0.15'
cookbook 'nodejs', '~> 2.2.0'
cookbook 'npm', '~> 0.1.2'
cookbook 'percona', '~> 0.15.5'
cookbook 'mysql', '~> 6.1.0'
cookbook 'nodejs', '~> 2.4.2'
cookbook 'percona', '~> 0.16.1'
cookbook 'phing', '~> 0.0.3'
cookbook 'php', '~> 1.5.0'
cookbook 'php', '~> 1.7.2'
cookbook 'python', '~> 1.4.6'
cookbook 'mailhog', '~> 0.1.0'
cookbook 'postfix', '~> 3.6.2'
cookbook 'postfix', '~> 3.7.0'
91 changes: 44 additions & 47 deletions Berksfile.lock
Original file line number Diff line number Diff line change
@@ -1,96 +1,93 @@
DEPENDENCIES
apache2 (~> 3.0.1)
apt (~> 2.6.1)
build-essential (~> 2.1.3)
composer (~> 2.0.0)
git (~> 4.1.0)
apache2 (~> 3.1.0)
apt (~> 2.8.2)
build-essential (~> 2.2.3)
composer (~> 2.2.0)
git (~> 4.3.4)
magento-toolbox (~> 0.0.3)
mailhog (~> 0.1.0)
mysql (~> 6.0.15)
nodejs (~> 2.2.0)
npm (~> 0.1.2)
percona (~> 0.15.5)
mysql (~> 6.1.0)
nodejs (~> 2.4.2)
percona (~> 0.16.1)
phing (~> 0.0.3)
php (~> 1.5.0)
postfix (~> 3.6.2)
php (~> 1.7.2)
postfix (~> 3.7.0)
python (~> 1.4.6)

GRAPH
7-zip (1.0.2)
windows (>= 1.2.2)
apache2 (3.0.1)
iptables (>= 0.0.0)
logrotate (>= 0.0.0)
apt (2.6.1)
apache2 (3.1.0)
apt (2.8.2)
ark (0.9.0)
7-zip (>= 0.0.0)
windows (>= 0.0.0)
build-essential (2.1.3)
chef-sugar (3.0.1)
chef_handler (1.1.6)
composer (2.0.0)
build-essential (2.2.3)
chef-sugar (3.1.1)
chef-vault (1.3.0)
chef_handler (1.2.0)
composer (2.2.0)
php (>= 0.0.0)
windows (>= 0.0.0)
dmg (2.2.2)
git (4.1.0)
git (4.3.4)
build-essential (>= 0.0.0)
dmg (>= 0.0.0)
runit (>= 1.0)
windows (>= 0.0.0)
yum (~> 3.0)
yum-epel (>= 0.0.0)
iis (4.1.0)
homebrew (1.13.0)
build-essential (>= 2.1.2)
iis (4.1.1)
windows (>= 1.34.6)
iptables (0.14.1)
logrotate (1.9.1)
magento-toolbox (0.0.3)
php (>= 0.0.0)
mailhog (0.1.0)
runit (>= 0.0.0)
mysql (6.0.17)
mysql (6.1.1)
smf (>= 0.0.0)
yum-mysql-community (>= 0.0.0)
nodejs (2.2.0)
nodejs (2.4.2)
apt (>= 0.0.0)
ark (>= 0.0.0)
build-essential (>= 0.0.0)
homebrew (>= 0.0.0)
yum-epel (>= 0.0.0)
npm (0.1.2)
nodejs (>= 0.0.0)
openssl (4.0.0)
chef-sugar (>= 0.0.0)
percona (0.15.5)
apt (>= 1.9)
openssl (4.4.0)
chef-sugar (>= 3.1.1)
packagecloud (0.1.0)
percona (0.16.1)
apt (>= 2.7.0)
build-essential (>= 0.0.0)
chef-vault (>= 0.0.0)
openssl (>= 0.0.0)
yum (~> 3.0)
yum-epel (>= 0.0.0)
phing (0.0.3)
composer (>= 0.0.0)
php (>= 0.0.0)
php (1.5.0)
php (1.7.2)
build-essential (>= 0.0.0)
iis (>= 0.0.0)
mysql (>= 0.0.0)
mysql (>= 6.0.0)
windows (>= 0.0.0)
xml (>= 0.0.0)
yum-epel (>= 0.0.0)
postfix (3.6.2)
postfix (3.7.0)
python (1.4.6)
build-essential (>= 0.0.0)
yum-epel (>= 0.0.0)
rbac (1.0.2)
runit (1.5.18)
build-essential (>= 0.0.0)
yum (~> 3.0)
yum-epel (>= 0.0.0)
smf (2.2.6)
rbac (1.0.3)
runit (1.7.2)
packagecloud (>= 0.0.0)
smf (2.2.7)
rbac (>= 1.0.1)
windows (1.36.6)
windows (1.38.2)
chef_handler (>= 0.0.0)
xml (1.2.13)
build-essential (>= 0.0.0)
chef-sugar (>= 0.0.0)
yum (3.5.3)
yum-epel (0.6.0)
yum (~> 3.0)
yum-mysql-community (0.1.14)
yum (3.7.1)
yum-epel (0.6.3)
yum (~> 3.2)
yum-mysql-community (0.1.18)
yum (>= 3.0)
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Change Log

## [1.0.2] - 2015-09-25

### Fixed
- Check if vagrant-berkshelf plugin is installed before trying to disable it
- Fix keyserver override for Percona repository
- Replace Apache event MPM with prefork
- Fix phpmyadmin installation

### Changed
- Update name of base box provided by Chef
- Upgrade vendor cookbooks
- Upgrade node.js version
- Use nodejs cookbook to install npm modules

### Removed
- Remove deprecated apache template

## [1.0.1] - 2015-04-12

### Fixed
Expand Down
10 changes: 8 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
# please see the online documentation at vagrantup.com.

# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "chef/ubuntu-14.04"
config.vm.box = "bento/ubuntu-14.04"

if Vagrant.has_plugin? 'vagrant-omnibus'
# Set Chef version for Omnibus
Expand All @@ -20,6 +20,12 @@ Vagrant.configure("2") do |config|
"vagrant plugin install vagrant-omnibus"
end

# Disable vagrant-berkshelf because it overrides chef cookbooks path
# See https://github.com/berkshelf/vagrant-berkshelf/issues/274
if Vagrant.has_plugin? 'vagrant-berkshelf'
config.berkshelf.enabled = false
end

# Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine.
# Forward MySql port on 33066, used for connecting admin-clients to localhost:33066
Expand Down Expand Up @@ -49,7 +55,7 @@ Vagrant.configure("2") do |config|
# path, and data_bags path (all relative to this Vagrantfile), and adding
# some recipes and/or roles.
config.vm.provision :chef_zero do |chef|
chef.cookbooks_path = ["berks-cookbooks", "cookbooks"]
chef.cookbooks_path = ["berks-cookbooks", "cookbooks"]
chef.data_bags_path = "data_bags"

# List of recipes to run
Expand Down
75 changes: 49 additions & 26 deletions berks-cookbooks/apache2/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,34 @@ apache2 Cookbook Changelog
==========================
This file is used to list changes made in each version of the apache2 cookbook.

v3.1.0 (2015-05-25)
-------------------

- [GH-315] Fix `apache.default_site_name` .conf extension references to ensure deletion
- [GH-258] Use `apache.default_site_name` for consistency, minimize hardcoding of filenames
- [GH-259] Add `&& sleep 1` to end of apache restart command on rhel-based systems using apache2.2
- [GH-271] Remove FreeBSD 9.x, Red Hat and CentOS 5.x and OpenSUSE 11.x Series from tests and focus on newer releases
- [GH-276] Add psych gem to development gems
- [GH-293] Add `apache.mod_fastcgi.install_method` flag to allow install of mod_fastcgi from source (even on Debian family)
- [GH-285] Made `apache.devel_package` configurable based on platform, including support for Amazon Linux.
- [GH-316] Update Opscode references to Chef
- [GH-318] Apply default recipe in all definitions
- [GH-320] Add attribute to adjust `apache.default_site_port`
- [GH-321] Fix issue with default_site name in not_if guards
- [GH-322] Add `apache.mod_ssl.pkg_name` to allow custom mod_ssl package names. Set defaults for supported platforms including Amazon Linux
- [GH-323] Don't create the default site configuration file in `sites-available` unless it is enabled.
- [GH-324] Add `apache.mod_ssl.port` to set the default ssl port to something other than 443
- [GH-328] Add the ability to pass in a pipe as to log
- [GH-332] `SSLStrictSNIVHostCheck` is only written to config if enabled to avoid breaking apache prior to 2.2.12.
- [GH-334] Removed `iptables`, `god-monitor`, and `logrotate` recipes to avoid having external dependencies. These services should be managed in a wrapper cookbook going forward.
- [GH-339] Allow custom names for php so_filename (`node['apache']['mod_php5']['so_filename']`)


v3.0.1 (2015-02-11)
-------------------

- [GH-310] Ubuntu Apache 2.2 requires the lock_dir to be owned by www-data
- [GH-307] Clarify that apache.version is a string
- [GH-309] Clarify that apache.version is a string
- [GH-305] Restart service after MPM changes
- [GH-304] Don't install systemd module on Amazon Linux
- [GH-298] Add non-threaded MPM break notice for PHP users
Expand Down Expand Up @@ -131,7 +154,7 @@ v1.10.2 (2014-04-09)
- [COOK-4492] - Fix service[apache2] CHEF-3694 duplication
- [COOK-4493] - Fix template[ports.conf] CHEF-3694 duplication

As of 2014-04-04 and per [Community Cookbook Diversification](https://wiki.opscode.com/display/chef/Community+Cookbook+Diversification) this cookbook now maintained by OneHealth Solutions. Please be patient as we get into the swing of things.
As of 2014-04-04 and per [Community Cookbook Diversification](https://wiki.chef.io/display/chef/Community+Cookbook+Diversification) this cookbook now maintained by OneHealth Solutions. Please be patient as we get into the swing of things.

v1.10.0 (2014-03-28)
--------------------
Expand All @@ -158,16 +181,16 @@ v1.9.1 (2014-02-27)
v1.9.0 (2014-02-21)
-------------------
### Improvement
- **[COOK-4076](https://tickets.opscode.com/browse/COOK-4076)** - foodcritic: dependencies are not defined properly
- **[COOK-2572](https://tickets.opscode.com/browse/COOK-2572)** - Add mod_pagespeed recipe to apache2
- **[COOK-4076](https://tickets.chef.io/browse/COOK-4076)** - foodcritic: dependencies are not defined properly
- **[COOK-2572](https://tickets.chef.io/browse/COOK-2572)** - Add mod_pagespeed recipe to apache2

### Bug
- **[COOK-4043](https://tickets.opscode.com/browse/COOK-4043)** - apache2 cookbook does not depend on 'iptables'
- **[COOK-3919](https://tickets.opscode.com/browse/COOK-3919)** - Move the default pidfile for apache2 on Ubuntu 13.10 or greater
- **[COOK-3863](https://tickets.opscode.com/browse/COOK-3863)** - Add recipe for mod_jk
- **[COOK-3804](https://tickets.opscode.com/browse/COOK-3804)** - Fix incorrect datatype for apache/default_modules, use recipes option in metadata
- **[COOK-3800](https://tickets.opscode.com/browse/COOK-3800)** - Cannot load modules that use non-standard module identifiers
- **[COOK-1689](https://tickets.opscode.com/browse/COOK-1689)** - The perl package name should be configurable
- **[COOK-4043](https://tickets.chef.io/browse/COOK-4043)** - apache2 cookbook does not depend on 'iptables'
- **[COOK-3919](https://tickets.chef.io/browse/COOK-3919)** - Move the default pidfile for apache2 on Ubuntu 13.10 or greater
- **[COOK-3863](https://tickets.chef.io/browse/COOK-3863)** - Add recipe for mod_jk
- **[COOK-3804](https://tickets.chef.io/browse/COOK-3804)** - Fix incorrect datatype for apache/default_modules, use recipes option in metadata
- **[COOK-3800](https://tickets.chef.io/browse/COOK-3800)** - Cannot load modules that use non-standard module identifiers
- **[COOK-1689](https://tickets.chef.io/browse/COOK-1689)** - The perl package name should be configurable


v1.8.14
Expand Down Expand Up @@ -198,36 +221,36 @@ Locking yum dependency to '< 3'
v1.8.4
------
### Bug
- **[COOK-3769](https://tickets.opscode.com/browse/COOK-3769)** - Fix a critical bug where the `apache_module` could not enable modules
- **[COOK-3769](https://tickets.chef.io/browse/COOK-3769)** - Fix a critical bug where the `apache_module` could not enable modules


v1.8.2
------
### Bug
- **[COOK-3766](https://tickets.opscode.com/browse/COOK-3766)** - Fix an issue where the `mod_ssl` recipe fails due to a missing attribute
- **[COOK-3766](https://tickets.chef.io/browse/COOK-3766)** - Fix an issue where the `mod_ssl` recipe fails due to a missing attribute


v1.8.0
------
### Bug
- **[COOK-3680](https://tickets.opscode.com/browse/COOK-3680)** - Update template paths
- **[COOK-3570](https://tickets.opscode.com/browse/COOK-3570)** - Apache cookbook breaks on RHEL / CentOS 6
- **[COOK-2944](https://tickets.opscode.com/browse/COOK-2944)** - Fix foodcritic failures
- **[COOK-2893](https://tickets.opscode.com/browse/COOK-2893)** - Improve mod_auth_openid recipe with guards and idempotency
- **[COOK-2758](https://tickets.opscode.com/browse/COOK-2758)** - Fix use of non-existent attribute
- **[COOK-3680](https://tickets.chef.io/browse/COOK-3680)** - Update template paths
- **[COOK-3570](https://tickets.chef.io/browse/COOK-3570)** - Apache cookbook breaks on RHEL / CentOS 6
- **[COOK-2944](https://tickets.chef.io/browse/COOK-2944)** - Fix foodcritic failures
- **[COOK-2893](https://tickets.chef.io/browse/COOK-2893)** - Improve mod_auth_openid recipe with guards and idempotency
- **[COOK-2758](https://tickets.chef.io/browse/COOK-2758)** - Fix use of non-existent attribute

### New Feature
- **[COOK-3665](https://tickets.opscode.com/browse/COOK-3665)** - Add recipe for mod_userdir
- **[COOK-3646](https://tickets.opscode.com/browse/COOK-3646)** - Add recipe for mod_cloudflare
- **[COOK-3213](https://tickets.opscode.com/browse/COOK-3213)** - Add recipe for mod_info
- **[COOK-3665](https://tickets.chef.io/browse/COOK-3665)** - Add recipe for mod_userdir
- **[COOK-3646](https://tickets.chef.io/browse/COOK-3646)** - Add recipe for mod_cloudflare
- **[COOK-3213](https://tickets.chef.io/browse/COOK-3213)** - Add recipe for mod_info

### Improvement
- **[COOK-3656](https://tickets.opscode.com/browse/COOK-3656)** - Parameterize apache2 binary
- **[COOK-3562](https://tickets.opscode.com/browse/COOK-3562)** - Allow mod_proxy settings to be configured as attributes
- **[COOK-3326](https://tickets.opscode.com/browse/COOK-3326)** - Fix default_test to use ServerTokens attribute
- **[COOK-2635](https://tickets.opscode.com/browse/COOK-2635)** - Add support for SVG mime types
- **[COOK-2598](https://tickets.opscode.com/browse/COOK-2598)** - FastCGI Module only works on Debian-based platforms
- **[COOK-1984](https://tickets.opscode.com/browse/COOK-1984)** - Add option to configure the address apache listens to
- **[COOK-3656](https://tickets.chef.io/browse/COOK-3656)** - Parameterize apache2 binary
- **[COOK-3562](https://tickets.chef.io/browse/COOK-3562)** - Allow mod_proxy settings to be configured as attributes
- **[COOK-3326](https://tickets.chef.io/browse/COOK-3326)** - Fix default_test to use ServerTokens attribute
- **[COOK-2635](https://tickets.chef.io/browse/COOK-2635)** - Add support for SVG mime types
- **[COOK-2598](https://tickets.chef.io/browse/COOK-2598)** - FastCGI Module only works on Debian-based platforms
- **[COOK-1984](https://tickets.chef.io/browse/COOK-1984)** - Add option to configure the address apache listens to


v1.7.0
Expand Down
Loading

0 comments on commit 40a98ca

Please sign in to comment.