Skip to content

Commit

Permalink
Remove dependency and prep for 6.0 release (#596)
Browse files Browse the repository at this point in the history
  • Loading branch information
damacus authored Feb 20, 2019
1 parent 8fbafde commit c7f9bb2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 deletions.
18 changes: 8 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ This file is used to list changes made in each version of the apache2 cookbook.

See UPGRADING.md for upgrading.

### Behaviour Changes
### v6 - Behaviour Changes

- Default recipe now calls the install resource!
- Default recipe now calls the install resource
- Add helpers: for a full list see `libraries/helpers.rb`
- Remove all `mpm_` recipes. Move mpm setup to the install resource
- Allow user to set the mpm mode no matter what platform they're on
- Remove MPM setup as it breaks things, just leave it alone for now
- Remove FreeBSD, openSuse & Fedora Kitchen testing
- `mod_` recipes now call `apache2_module_`
- Mod templates are now more configurable when calling the resources directly
Expand All @@ -23,22 +22,21 @@ See UPGRADING.md for upgrading.
- Remove the web_app resource as it was very perscriptive
- Add mod_ssl

### Testing/CI
### v6 - Testing/CI

- Add CircleCI and remove Travis
- Add CircleCI Orbs
- Rename test cookbook name to test
- Include apache2 hardening inspec tests
- Cleanup test integration directory
- Specs added for most helpers.
- Make sysconfig paramters configurable via the install resource
- Specs added for most helpers
- Make sysconfig parameters configurable via the install resource

### Misc Updates & Improvements
### v6 - Misc Updates & Improvements

- Update README
- Add dev-sec/apache-baseline tests and set cookbook defaults to secure defaults
- Update README with new instructions on installing
- Set the server to listen on ports 80 and 443 by default
- Fix Options allowed in alias.conf
- Add resource documentation to documentation directory

## v5.2.1 (04-09-2018)

Expand Down
16 changes: 7 additions & 9 deletions metadata.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name 'apache2'
source_url 'https://github.com/sous-chefs/apache2'
issues_url 'https://github.com/sous-chefs/apache2/issues'
maintainer 'Sous Chefs'
source_url 'https://github.com/sous-chefs/apache2'
issues_url 'https://github.com/sous-chefs/apache2/issues'
maintainer 'Sous Chefs'
maintainer_email '[email protected]'
chef_version '>= 13.0'
license 'Apache-2.0'
description 'Installs and configures apache2'
chef_version '>= 13.0'
license 'Apache-2.0'
description 'Installs and configures apache2'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '5.2.1'

depends 'yum-epel'
version '6.0.0'

supports 'debian'
supports 'ubuntu'
Expand Down

0 comments on commit c7f9bb2

Please sign in to comment.