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: v8.0.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: v8.1.0
Choose a head ref
  • 18 commits
  • 25 files changed
  • 8 contributors

Commits on Aug 9, 2022

  1. Allow custom_config to have a string priority again

    In f41251e the type was narrowed to no
    longer allow strings, but this can cause problems.
    
    Sorting is alphabetical and you need to format it for the correct
    sorting. So to make sure 2 loads before 10 you need to format it as 02.
    While the vhost can do some printf style magic to change 2 to 02, it
    must then also know what the highest number is. Otherwise 100 is sorted
    before 20. By allowing strings, you allow the caller to fix this.
    
    A type alias is introduced to reduce duplication and make it easier to
    track.
    
    Fixes: f41251e
    martin-koerner authored Aug 9, 2022
    Configuration menu
    Copy the full SHA
    b43350c View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. fix duplicate definition of auth_basic-mod

    PR 2252 breaks the usage of auth_basic in a vhost, because the module is
    declared twice:
    
    Error: Could not retrieve catalog from remote server: Error 500 on SERVER: Server Error: Evaluation Error: Error while evaluating a Resource Statement, Evaluation Error: Error while evaluating a Resource Statement, Duplicate declaration: Apache::Mod[auth_basic] is already declared at (file: /etc/puppetlabs/code/environments/module_updates/modules/apache/manifests/default_mods.pp, line: 142); cannot redeclare (file: /etc/puppetlabs/code/environments/module_updates/modules/apache/manifests/mod/auth_basic.pp, line: 7) (file: /etc/puppetlabs/code/environments/module_updates/modules/apache/manifests/mod/auth_basic.pp, line: 7, column: 3) (file: /etc/puppetlabs/code/environments/module_updates/site-modules/rx_apache/manifests/vhost.pp, line: 336) on node ...
    
    fix it by including the appropriate class in defaults_mods, instead of
    just defining the module
    sircubbi committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    52371a9 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2287 from sircubbi/bugfix_authbasic_module_after_…

    …pr2252
    
    fix duplicate definition of auth_basic-mod
    david22swan authored Aug 10, 2022
    Configuration menu
    Copy the full SHA
    921de9e View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2284 from martin-koerner/custom_config_prio

    Allow custom_config to have a string priority again
    david22swan authored Aug 10, 2022
    Configuration menu
    Copy the full SHA
    e1f9cae View commit details
    Browse the repository at this point in the history
  4. Include apache::mod::authn_core in every auth mod

    The authn_core module is needed for AuthType, which is needed to select
    a specific auth. While modules may load without them, it's unlikely to
    work in practice.
    
    This is only relevant when default mods are disabled since authn_core is
    a default module.
    ekohl committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    985d959 View commit details
    Browse the repository at this point in the history
  5. Manage DNF module for mod_auth_openidc

    On EL 8 mod_auth_openidc is in a DNF module that must be enabled.
    Otherwise the package is uninstallable. This is verified by adding an
    acceptance test for the class.
    
    The inheritance on apache::params is removed since it was redundant.
    That is only needed if a class parameter uses apache::params.
    
    $oidc_settings on apache::vhost is changed to have a default. The
    template expects one and With that it's impossible to miscompile. The
    alternative is to implement a fail() inside the code if it is empty, but
    this provides some safety.
    ekohl committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    8417c0b View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. Remove auth_kerb and nss from Debian Bullseye

    libapache2-mod-auth-kerb is unavailable in Debian Bullseye[1]
    libapache2-mod-auth-kerb was removed in Debian Buster[2]
    
    [1]: https://packages.debian.org/buster/libapache2-mod-auth-kerb
    [2]: https://packages.debian.org/stretch/libapache2-mod-nss
    ekohl committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    9044b4c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2281 from ekohl/remove-removed-mods

    Remove auth_kerb and nss from Debian Bullseye
    david22swan authored Aug 11, 2022
    Configuration menu
    Copy the full SHA
    b0fff67 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2283 from ekohl/add-mod_auth_openidc-acceptance-test

    Manage DNF module for mod_auth_openidc
    david22swan authored Aug 11, 2022
    Configuration menu
    Copy the full SHA
    2603379 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0f3c2d8 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #2292 from francetv/main

    Allow setting icons_path to false so no alias will be set for it
    david22swan authored Aug 11, 2022
    Configuration menu
    Copy the full SHA
    b9547ef View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. Allow integers for timeouts

    Timeouts are more naturally written as integers, allow them.
    traylenator committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    5243360 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Merge pull request #2294 from traylenator/timeout

    Allow integers for timeouts
    david22swan authored Aug 17, 2022
    Configuration menu
    Copy the full SHA
    04a914a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    58078cc View commit details
    Browse the repository at this point in the history
  3. Update for Ubuntu 22.04

    david22swan committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    f9710ef View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. Merge pull request #2276 from puppetlabs/pdksync_GH-cat-11/main/add_u…

    …buntu_22.04_support
    
    pdksync - (GH-cat-11) Certify Support for Ubuntu 22.04
    pmcmaw authored Aug 18, 2022
    Configuration menu
    Copy the full SHA
    1475cd7 View commit details
    Browse the repository at this point in the history
  2. Release prep v8.1.0

    GitHub Action committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    9674a9d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2297 from puppetlabs/release-prep

    Release prep v8.1.0
    david22swan authored Aug 18, 2022
    Configuration menu
    Copy the full SHA
    babf023 View commit details
    Browse the repository at this point in the history
Loading