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.7.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.8.0
Choose a head ref
  • 17 commits
  • 40 files changed
  • 7 contributors

Commits on Jun 21, 2013

  1. Apache should symlink to sites-available

    On Debian systems vhost definitions should go in sites-available and be
    symlinked to from sites-enabled. apache2.conf should include
    sites-enabled/*.conf. This updates the module to follow this behaviour.
    
    Closes #161. Closes #135
    hunner committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    8d7bdc5 View commit details
    Browse the repository at this point in the history
  2. Correct vhost_alias behaviour on Debian

    In testing the sites-enabled symlinks, it was discovered that the
    virtual_docroot parameter did not work on debian without also including
    the vhost_alias httpd mod. This corrects that behaviour.
    hunner committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    e9dfc8d View commit details
    Browse the repository at this point in the history
  3. PHP uses php5.conf as config file

    In testing sites-enabled behaviour, it was discovered that php loading
    did not perform as expected on Debian due to including configuration
    files from mods-available instead of mods-enabled. This corrects that
    behaviour.
    hunner committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    9b77fe7 View commit details
    Browse the repository at this point in the history
  4. Ensure directory, install packages, purge confs

    The ability to purge configs to preserve pristine working conditions is
    often critical to avoid breaking apache unintentionally. On many
    platforms the apache package will create directories into which other
    apache mod package will place configs. These can conflict with configs
    managed by puppet and cause apache service failures. This would normally
    be corrected by purging those stray files on the second puppet run, but
    in the mean time apache would have stopped. Single-run idempotency is
    preferable.
    
    Since Puppet cannot separately ensure => directory and purge => true,
    this commit uses an exec resource and mkdir to create the directories,
    and uses a file resource *after* all mods have been processed to do the
    ownership & purging.
    hunner committed Jun 21, 2013
    Configuration menu
    Copy the full SHA
    29f04d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2013

  1. Merge pull request #235 from hunner/sites_symlinks

    Sites symlinks
    apenney committed Jul 9, 2013
    Configuration menu
    Copy the full SHA
    4d24546 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2013

  1. Configuration menu
    Copy the full SHA
    05155c5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #249 from oxilion/multiple_balancers

    make fragment names unique to support multiple balancerclusters
    hunner committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    0128341 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2013

  1. Issue 230 specifiy that: The apache::mod::* classes that have .conf file

    resources don't refresh the service when the configs are updated, but they
    should. (#230).
    
    This commit fixes the issue by adding:
    
            notify  => Service['httpd'],
    
    to all file resources.
    
    Note that the modification has only been tested with a few of the modules.
    gehel committed Jul 13, 2013
    Configuration menu
    Copy the full SHA
    5f6c381 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9d68964 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2013

  1. Configuration menu
    Copy the full SHA
    c94b944 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #252 from oxilion/proxy_set

    add proxy_set option to balancer
    hunner committed Jul 15, 2013
    Configuration menu
    Copy the full SHA
    bb0f232 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #251 from blkperl/pr_242

    Add severname parameter to httpd.conf
    hunner committed Jul 15, 2013
    Configuration menu
    Copy the full SHA
    97339df View commit details
    Browse the repository at this point in the history
  4. Merge pull request #250 from gehel/issue-230

    Issue 230 specifiy that: The apache::mod::* classes that have .conf file
    hunner committed Jul 15, 2013
    Configuration menu
    Copy the full SHA
    c029b46 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2013

  1. make directories examples real puppet DSL

    People don't read:
    
        directory => [ { path => '/path/to/directory', <directive> => <value> } ],
    
    as psuedo-code example instructing you on how to form an array of hashes, they
    read them as puppet DSL examples that they can copy and paste into their
    apache::vhost stanzas.
    richardc committed Jul 16, 2013
    Configuration menu
    Copy the full SHA
    bb13c55 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #253 from richardc/vhost_directories_usage

    make directories examples real puppet DSL
    hunner committed Jul 16, 2013
    Configuration menu
    Copy the full SHA
    e9d22e0 View commit details
    Browse the repository at this point in the history
  3. Release 0.8.0

    Features:
    - Add `servername` parameter to `apache` class
    - Add `proxy_set` parameter to `apache::balancer` define
    
    Bugfixes:
    - Fix ordering for multiple `apache::balancer` clusters
    - Fix symlinking for sites-available on Debian-based OSs
    - Fix dependency ordering for recursive confdir management
    - Fix `apache::mod::*` to notify the service on config change
    - Documentation updates
    hunner committed Jul 16, 2013
    Configuration menu
    Copy the full SHA
    69e53ee View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2013

  1. Merge pull request #255 from hunner/release_0.8.0

    Release 0.8.0
    Ashley Penney committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    ac4673a View commit details
    Browse the repository at this point in the history
Loading