Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-apache
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.3.0
Choose a base ref
...
head repository: puppetlabs/puppetlabs-apache
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.4.0
Choose a head ref
  • 14 commits
  • 20 files changed
  • 2 contributors

Commits on Aug 22, 2012

  1. Fixed formatting in vhost template.

    Martin Dluhos committed Aug 22, 2012
    Configuration menu
    Copy the full SHA
    18bd200 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2012

  1. Fixed syntax of validate_re function.

    Martin Dluhos committed Aug 23, 2012
    Configuration menu
    Copy the full SHA
    9cd964d View commit details
    Browse the repository at this point in the history

  2. Change line ending for erb expressions

    @hunner
    hunner committed Aug 23, 2012
    Configuration menu
    Copy the full SHA
    8c95c76 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #87 from martasd/fix-validate 

    Fixed syntax of validate_re function.
    @hunner
    hunner committed Aug 23, 2012
    Configuration menu
    Copy the full SHA
    1e6e8e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2012

  1. Updating spec coverage for new defines 

    - Functionality of the apache module depends on the existence of either
  `$osfamily` or `$operatingsystem`. The tests now reflect this.
- The class `apache` is no longer tested for inclusion in `apache::mod`
  because of a bug in puppet-rspec which creates duplicate resources.
- Most of the test coverage is for existing code on the `Debian`
  `$osfamily` as per the the pre-existing design. `RedHat` coverage has
  been added on a few specific counts.
    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    78208d8 View commit details
    Browse the repository at this point in the history

  2. Change $module to $mod to cope with puppet-rspec bugs

    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    b1566b6 View commit details
    Browse the repository at this point in the history

  3. Update apache::params to fail on unsupported operatingsystems inste… 

    …ad of playing dumb
    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    118a5aa View commit details
    Browse the repository at this point in the history

  4. Get apache::python and apache::mod::python to pass unit tests

    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    7082a2a View commit details
    Browse the repository at this point in the history

  5. Update apache::mod::ssl tests, and fixup for master branch

    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    c1a3c92 View commit details
    Browse the repository at this point in the history

  6. Update the quoted hash-indexes for puppet 2.6+2.7 compatibility

    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    ec83e55 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #83 from hunner/fix_failing_spec_tests 

    Fix failing spec tests

reviewed-by: branan@puppetlabs.com
    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    9715a20 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #88 from hunner/fix-vhost-template 

    Fix vhost template

reviewed-by: branan@puppetlabs.com
    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    147b75c View commit details
    Browse the repository at this point in the history

  9. Release 0.4.0 

    Changes:
- `include apache` is now required when using apache::mod::*

Bugfixes:
- Fix syntax for validate_re
- Fix formatting in vhost template
- Fix spec tests such that they pass
    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    0685f22 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #90 from hunner/release_0.4.0 

    Release 0.4.0
    @hunner
    hunner committed Aug 24, 2012
    Configuration menu
    Copy the full SHA
    66d5ce9 View commit details
    Browse the repository at this point in the history
Loading