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: 1.8.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: 1.8.1
Choose a head ref
  • 9 commits
  • 11 files changed
  • 4 contributors

Commits on Jan 28, 2016

  1. Preserve /etc/httpd/conf.d/passenger.conf on EL7

    mod_passenger provides a passenger.conf containing PassengerRoot to
    ensure the service starts up correctly.  On EL7, this is installed at
    /etc/httpd/conf.d/passenger.conf and has been protected from purging
    since 005bf61.
    
    The change in 2a60859 to move LoadModule config files to
    /etc/httpd/conf.modules.d/ on EL7 also affected the path of the
    protected passenger.conf.  This change reverts the path change to match
    the packages.
    
    In summary, prior to 2a60859 (release 1.7.0):
    
    - /etc/httpd/conf.d/passenger.conf with PassengerRoot (packaged)
    - /etc/httpd/conf.d/passenger_extra.conf with apache::mod::passenger settings
    - /etc/httpd/conf.d/zpassenger.load with LoadModule
    
    In 2a60859 (release 1.8.0):
    
    - /etc/httpd/conf.modules.d/passenger_extra.conf with apache::mod::passenger settings
    - /etc/httpd/conf.modules.d/zpassenger.load with LoadModule
    - /etc/httpd/conf.d/passenger.conf is purged
    
    With this commit:
    
    - /etc/httpd/conf.modules.d/passenger_extra.conf with apache::mod::passenger settings
    - /etc/httpd/conf.modules.d/zpassenger.load with LoadModule
    - /etc/httpd/conf.d/passenger.conf with PassengerRoot (packaged)
    Dominic Cleal committed Jan 28, 2016
    3 Configuration menu
    Copy the full SHA
    ecc2909 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1345 from domcleal/1.8.x-13405-passengerroot-el7

    Preserve /etc/httpd/conf.d/passenger.conf on EL7
    bmjen committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    4d0c2b9 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2016

  1. Configuration menu
    Copy the full SHA
    4b0cd61 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e96a933 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1348 from bmjen/modules-3018

    (MODULES-3018) Fixes apache to work correctly with concat.
    hunner committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    07cc69b View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. Edit and restyle the README.

    -   Adds more default values for parameters.
    -   Styles parameters and values more consistently.
    -   Updates several broken or outdated external links.
    -   Fixes broken internal links.
    -   Replaces "define" (as a noun) with "defined type" for clarity.
    -   Updates code fences from tildes to backticks.
    -   Fixes mispelled references to `mod_auth_mellon`.
    gguillotte committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    28e0f3e View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1358 from gguillotte/18x-readme

    1.8.x README revisions
    bmjen committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    c1d4e26 View commit details
    Browse the repository at this point in the history
  3. Release Prep for 1.8.1

    bmjen committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    0806e59 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1362 from bmjen/prep_1.8.1

    Release Prep for 1.8.1
    hunner committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    d76699a View commit details
    Browse the repository at this point in the history
Loading