Skip to content

Allow overriding the detected $apache_name. #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

smerrill
Copy link
Contributor

This will mainly be useful for supporting Red Hat Software Collections, where 'httpd24-httpd' installs Apache 2.4 alongside Apache 2.2 in the base repository. The $service_name parameter already allows customization of the service to use, but not the package.

With this PR, the following can be used to set up and run Apache 2.4 on RHELish systems. (The config snippet I mentioned in #818 was missing this.)

  softwarecollectionsorg { 'httpd24': }
  class { '::apache':
    apache_name    => 'httpd24-httpd',
    service_name   => 'httpd24-httpd',
    apache_version => '2.4',
    mpm_module     => 'event',
    httpd_dir      => '/opt/rh/httpd24/root/etc/httpd',
    vhost_dir      => '/opt/rh/httpd24/root/etc/httpd/conf.d',
    require        => Softwarecollectionsorg['httpd24'],
  }

@puppetcla
Copy link

Waiting for CLA signature by @smerrill

@smerrill - We require a Contributor License Agreement (CLA) for people who contribute to Puppet, but we have an easy click-through license with instructions, which is available at https://cla.puppetlabs.com/

Note: if your contribution is trivial and you think it may be exempt from the CLA, please post a short reply to this comment with details. http://docs.puppetlabs.com/community/trivial_patch_exemption.html

@underscorgan
Copy link
Contributor

@smerrill Can you please update the README and add a test case to exercise the new parameter?

Thanks!

@underscorgan
Copy link
Contributor

@smerrill Could you squash this to a single commit? Otherwise, looks good!

This will mainly be useful for supporting Red Hat Software Collections,
where 'httpd24-httpd' installs Apache 2.4 alongside Apache 2.2 in the
base repository. The $service_name parameter already allows
customization of the service to use, but not the package.

Document the ::apache::apache_name parameter.

Add a test for the apache_name param.
@smerrill
Copy link
Contributor Author

Squashed commits attached for this one and #818. I'm talking with my company about accepting the CLA. Hopefully I'll have an answer soon.

@smerrill
Copy link
Contributor Author

I've accepted the CLA.

@puppetcla
Copy link

CLA signed by all contributors.

igalic added a commit that referenced this pull request Aug 18, 2014
…package

Allow overriding the detected $apache_name.
@igalic igalic merged commit db8a4f8 into puppetlabs:master Aug 18, 2014
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
This commit reverts the modification of the TMPDIR environment variable
from the previous release. This change was made to fix a bug in
docker compose where some processes would fail if the noexec bit had
been set on /tmp. However this change caused unexpected failures in
certain environments.
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
…rmission_denied_from_mkdir

Fix permission denied issue introduced in v4.2.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants